aboutsummaryrefslogtreecommitdiff
path: root/arch/x86/events
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2020-06-28 11:58:14 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2020-06-28 11:58:14 -0700
commitae71d4bf0074a81cc04255c96e3de0a49b1d95fa (patch)
tree24901228d69e7dffac0326b0e1c81887820f01b8 /arch/x86/events
parentbc53f67d247a38d43e081faa7e63690a1279f5c7 (diff)
parent16accae3d97f97d7f61c4ee5d0002bccdef59088 (diff)
downloadlinux-ae71d4bf0074a81cc04255c96e3de0a49b1d95fa.tar.gz
Merge tag 'perf-urgent-2020-06-28' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull perf fix from Ingo Molnar: "A single Kbuild dependency fix" * tag 'perf-urgent-2020-06-28' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: perf/x86/rapl: Fix RAPL config variable bug
Diffstat (limited to 'arch/x86/events')
-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 12c42eba77ec..9933c0e8e97a 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/