]> git.baikalelectronics.ru Git - kernel.git/commit
tools/testing/nvdimm: Fix security_init() symbol collision
authorDan Williams <dan.j.williams@intel.com>
Mon, 4 Apr 2022 03:19:46 +0000 (20:19 -0700)
committerDan Williams <dan.j.williams@intel.com>
Fri, 8 Apr 2022 19:59:25 +0000 (12:59 -0700)
commit38e8048acddb7392a59fa1efeb638b25fd2eee48
treeb280d622f8b3c0f131f261ae7a7dd0e76e928ecb
parent6d94017b7b59bab528be97be158d0d602982e3a6
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: a6d71721004f ("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>
tools/testing/nvdimm/test/nfit.c