From e8cf229ebe5eb31eecee86268223530a872872c2 Mon Sep 17 00:00:00 2001

From: Dan Williams <dan.j.williams@intel.com>

Date: Sun, 3 Apr 2022 20:19:46 -0700

Subject: [PATCH] tools/testing/nvdimm: Fix security_init() symbol collision

MIME-Version: 1.0

Content-Type: text/plain; charset=UTF-8

Content-Transfer-Encoding: 8bit

References: jsc#PED-1925

Patch-mainline: v5.18-rc2

Git-commit: e8cf229ebe5eb31eecee86268223530a872872c2

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>

Acked-by: Michal Suchanek <msuchanek@suse.de>

---

 tools/testing/nvdimm/test/nfit.c | 4 ++--

 1 file 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);

 }

-- 

2.35.3