mirror of
https://github.com/torvalds/linux.git
synced 2024-11-11 06:31:49 +00:00
de7a9e949f
The following build failure occurs when CONFIG_PERF_EVENTS is not set
as generic pmu functions are not visible in that scenario.
|-- s390-randconfig-r044-20220313
| |-- nd_perf.c:(.text):undefined-reference-to-perf_pmu_migrate_context
| |-- nd_perf.c:(.text):undefined-reference-to-perf_pmu_register
| `-- nd_perf.c:(.text):undefined-reference-to-perf_pmu_unregister
Similar build failure in nds32 architecture:
nd_perf.c:(.text+0x21e): undefined reference to `perf_pmu_migrate_context'
nd_perf.c:(.text+0x434): undefined reference to `perf_pmu_register'
nd_perf.c:(.text+0x57c): undefined reference to `perf_pmu_unregister'
Fix this issue by adding check for CONFIG_PERF_EVENTS config option
and disabling the nvdimm perf interface incase this config is not set.
Also remove function declaration of perf_pmu_migrate_context,
perf_pmu_register, perf_pmu_unregister functions from nd.h as these are
common pmu functions which are part of perf_event.h and since we
are disabling nvdimm perf interface incase CONFIG_PERF_EVENTS option
is not set, we not need to declare them in nd.h
Also move the platform_device header file addition part from nd.h to
nd_perf.c and add stub functions for register_nvdimm_pmu and
unregister_nvdimm_pmu functions to handle CONFIG_PERF_EVENTS=n
case.
Fixes: 0fab1ba6ad ("drivers/nvdimm: Add perf interface to expose nvdimm performance stats") (Commit id based on libnvdimm-for-next tree)
Signed-off-by: Kajol Jain <kjain@linux.ibm.com>
Link: https://lore.kernel.org/all/62317124.YBQFU33+s%2FwdvWGj%25lkp@intel.com/
Reported-by: kernel test robot <lkp@intel.com>
Link: https://lore.kernel.org/r/20220323164550.109768-1-kjain@linux.ibm.com
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
34 lines
945 B
Makefile
34 lines
945 B
Makefile
# SPDX-License-Identifier: GPL-2.0
|
|
obj-$(CONFIG_LIBNVDIMM) += libnvdimm.o
|
|
obj-$(CONFIG_BLK_DEV_PMEM) += nd_pmem.o
|
|
obj-$(CONFIG_ND_BTT) += nd_btt.o
|
|
obj-$(CONFIG_X86_PMEM_LEGACY) += nd_e820.o
|
|
obj-$(CONFIG_OF_PMEM) += of_pmem.o
|
|
obj-$(CONFIG_VIRTIO_PMEM) += virtio_pmem.o nd_virtio.o
|
|
|
|
nd_pmem-y := pmem.o
|
|
|
|
nd_btt-y := btt.o
|
|
|
|
nd_e820-y := e820.o
|
|
|
|
libnvdimm-y := core.o
|
|
libnvdimm-y += bus.o
|
|
libnvdimm-y += dimm_devs.o
|
|
libnvdimm-$(CONFIG_PERF_EVENTS) += nd_perf.o
|
|
libnvdimm-y += dimm.o
|
|
libnvdimm-y += region_devs.o
|
|
libnvdimm-y += region.o
|
|
libnvdimm-y += namespace_devs.o
|
|
libnvdimm-y += label.o
|
|
libnvdimm-y += badrange.o
|
|
libnvdimm-$(CONFIG_ND_CLAIM) += claim.o
|
|
libnvdimm-$(CONFIG_BTT) += btt_devs.o
|
|
libnvdimm-$(CONFIG_NVDIMM_PFN) += pfn_devs.o
|
|
libnvdimm-$(CONFIG_NVDIMM_DAX) += dax_devs.o
|
|
libnvdimm-$(CONFIG_NVDIMM_KEYS) += security.o
|
|
|
|
TOOLS := ../../tools
|
|
TEST_SRC := $(TOOLS)/testing/nvdimm/test
|
|
obj-$(CONFIG_NVDIMM_TEST_BUILD) += $(TEST_SRC)/iomap.o
|