The following commit has been merged into the perf/urgent branch of tip:
Commit-ID: 16accae3d97f97d7f61c4ee5d0002bccdef59088
Gitweb:
https://git.kernel.org/tip/16accae3d97f97d7f61c4ee5d0002bccdef59088
Author: Stephane Eranian <eran...@google.com>
AuthorDate: Thu, 28 May 2020 13:16:14 -07:00
Committer: Ingo Molnar <mi...@kernel.org>
CommitterDate: Tue, 02 Jun 2020 11:52:56 +02:00
perf/x86/rapl: Fix RAPL config variable bug
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 <mi...@kernel.org>
Tested-by: Kim Phillips <kim.phill...@amd.com>
Acked-by: Peter Zijlstra <pet...@infradead.org>
Link: https://lore.kernel.org/r/20200528201614.250182-1-eran...@google.com
---
arch/x86/events/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/x86/events/Makefile b/arch/x86/events/Makefile
index 12c42eb..9933c0e 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/
