summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2022-04-10 07:31:59 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2022-04-10 07:31:59 +0300
commit94a4c2bb7a1fb95bd7105ac5685377f57c13daf3 (patch)
tree125bb95bbbdb1eeab61a4f0e4fce07d49fa02fd5 /tools
parentfa3b895da8e06d6e3dcf3e6941a3fd428343e3d7 (diff)
parentd28820419ca332f856cdf8bef0cafed79c29ed05 (diff)
downloadlinux-94a4c2bb7a1fb95bd7105ac5685377f57c13daf3.tar.xz
Merge tag 'cxl+nvdimm-for-5.18-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm
Pull cxl and nvdimm fixes from Dan Williams: - Fix a compile error in the nvdimm unit tests - Fix a shadowed variable warning in the CXL PCI driver * tag 'cxl+nvdimm-for-5.18-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm: cxl/pci: Drop shadowed variable tools/testing/nvdimm: Fix security_init() symbol collision
Diffstat (limited to 'tools')
-rw-r--r--tools/testing/nvdimm/test/nfit.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/testing/nvdimm/test/nfit.c b/tools/testing/nvdimm/test/nfit.c
index 65dbdda3a054..1da76ccde448 100644
--- a/tools/testing/nvdimm/test/nfit.c
+++ b/tools/testing/nvdimm/test/nfit.c
@@ -1842,7 +1842,7 @@ static int nfit_test_dimm_init(struct nfit_test *t)
return 0;
}
-static void security_init(struct nfit_test *t)
+static void nfit_security_init(struct nfit_test *t)
{
int i;
@@ -1938,7 +1938,7 @@ static int nfit_test0_alloc(struct nfit_test *t)
if (nfit_test_dimm_init(t))
return -ENOMEM;
smart_init(t);
- security_init(t);
+ nfit_security_init(t);
return ars_state_init(&t->pdev.dev, &t->ars_state);
}