Skip to content

Commit e8cf229

Browse files
committed
tools/testing/nvdimm: Fix security_init() symbol collision
Starting with the new perf-event support in the nvdimm core, the nfit_test mock module stops compiling. Rename its security_init() to nfit_security_init(). tools/testing/nvdimm/test/nfit.c:1845:13: error: conflicting types for ‘security_init’; have ‘void(struct nfit_test *)’ 1845 | static void security_init(struct nfit_test *t) | ^~~~~~~~~~~~~ In file included from ./include/linux/perf_event.h:61, from ./include/linux/nd.h:11, from ./drivers/nvdimm/nd-core.h:11, from tools/testing/nvdimm/test/nfit.c:19: Fixes: 9a61d08 ("drivers/nvdimm: Add nvdimm pmu structure") Cc: Kajol Jain <kjain@linux.ibm.com> Reviewed-by: Kajol Jain <kjain@linux.ibm.com> Reviewed-by: Vishal Verma <vishal.l.verma@intel.com> Link: https://lore.kernel.org/r/164904238610.1330275.1889212115373993727.stgit@dwillia2-desk3.amr.corp.intel.com Signed-off-by: Dan Williams <dan.j.williams@intel.com>
1 parent 3123109 commit e8cf229

File tree

1 file changed

+2
-2
lines changed
  • tools/testing/nvdimm/test

1 file changed

+2
-2
lines changed

tools/testing/nvdimm/test/nfit.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1842,7 +1842,7 @@ static int nfit_test_dimm_init(struct nfit_test *t)
18421842
return 0;
18431843
}
18441844

1845-
static void security_init(struct nfit_test *t)
1845+
static void nfit_security_init(struct nfit_test *t)
18461846
{
18471847
int i;
18481848

@@ -1938,7 +1938,7 @@ static int nfit_test0_alloc(struct nfit_test *t)
19381938
if (nfit_test_dimm_init(t))
19391939
return -ENOMEM;
19401940
smart_init(t);
1941-
security_init(t);
1941+
nfit_security_init(t);
19421942
return ars_state_init(&t->pdev.dev, &t->ars_state);
19431943
}
19441944

0 commit comments

Comments
 (0)