tools/testing/nvdimm: Fix compilation failure without CONFIG_DEV_DAX_PMEM_COMPAT
authorJan Kara <jack@suse.cz>
Thu, 23 Jan 2020 15:47:20 +0000 (16:47 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 29 Apr 2020 14:32:57 +0000 (16:32 +0200)
[ Upstream commit c0e71d602053e4e7637e4bc7d0bc9603ea77a33f ]

When a kernel is configured without CONFIG_DEV_DAX_PMEM_COMPAT, the
compilation of tools/testing/nvdimm fails with:

  Building modules, stage 2.
  MODPOST 11 modules
ERROR: "dax_pmem_compat_test" [tools/testing/nvdimm/test/nfit_test.ko] undefined!

Fix the problem by calling dax_pmem_compat_test() only if the kernel has
the required functionality.

Signed-off-by: Jan Kara <jack@suse.cz>
Link: https://lore.kernel.org/r/20200123154720.12097-1-jack@suse.cz
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
tools/testing/nvdimm/test/nfit.c

index bf6422a6af7ffb30dc0fea13d546f1f39446f010..a8ee5c4d41ebb124e356ed9dc22822bf97d1e8ab 100644 (file)
@@ -3164,7 +3164,9 @@ static __init int nfit_test_init(void)
        mcsafe_test();
        dax_pmem_test();
        dax_pmem_core_test();
+#ifdef CONFIG_DEV_DAX_PMEM_COMPAT
        dax_pmem_compat_test();
+#endif
 
        nfit_test_setup(nfit_test_lookup, nfit_test_evaluate_dsm);