summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorStephane Eranian <eranian@google.com>2020-05-28 23:16:14 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-07-16 09:16:32 +0300
commit3965fe7c0a778f4eb061ee77ca3e2bec1ea17c0a (patch)
tree4168b2b9935cac0063ea4920576de3d495046385 /arch
parent5f121ba6b625f470fef73475a08081ec52ab38d7 (diff)
downloadlinux-3965fe7c0a778f4eb061ee77ca3e2bec1ea17c0a.tar.xz
perf/x86/rapl: Fix RAPL config variable bug
[ Upstream commit 16accae3d97f97d7f61c4ee5d0002bccdef59088 ] This patch fixes a bug introduced by: fd3ae1e1587d6 ("perf/x86/rapl: Move RAPL support to common x86 code") The Kconfig variable name was wrong. It was missing the CONFIG_ prefix. Signed-off-by: Stephane Eranian <eraniangoogle.com> Signed-off-by: Ingo Molnar <mingo@kernel.org> Tested-by: Kim Phillips <kim.phillips@amd.com> Acked-by: Peter Zijlstra <peterz@infradead.org> Link: https://lore.kernel.org/r/20200528201614.250182-1-eranian@google.com Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/events/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/events/Makefile b/arch/x86/events/Makefile
index b418ef687879..726e83c0a31a 100644
--- a/arch/x86/events/Makefile
+++ b/arch/x86/events/Makefile
@@ -1,6 +1,6 @@
# SPDX-License-Identifier: GPL-2.0-only
obj-y += core.o probe.o
-obj-$(PERF_EVENTS_INTEL_RAPL) += rapl.o
+obj-$(CONFIG_PERF_EVENTS_INTEL_RAPL) += rapl.o
obj-y += amd/
obj-$(CONFIG_X86_LOCAL_APIC) += msr.o
obj-$(CONFIG_CPU_SUP_INTEL) += intel/