Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: 9a61d0838cd0 ("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>

+2 -2
+2 -2
tools/testing/nvdimm/test/nfit.c
··· 1842 1842 return 0; 1843 1843 } 1844 1844 1845 - static void security_init(struct nfit_test *t) 1845 + static void nfit_security_init(struct nfit_test *t) 1846 1846 { 1847 1847 int i; 1848 1848 ··· 1938 1938 if (nfit_test_dimm_init(t)) 1939 1939 return -ENOMEM; 1940 1940 smart_init(t); 1941 - security_init(t); 1941 + nfit_security_init(t); 1942 1942 return ars_state_init(&t->pdev.dev, &t->ars_state); 1943 1943 } 1944 1944