| From 7ebd8d1926da1d49e037dc7b25cb7c42b132f8f1 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Thu, 28 May 2020 13:16:14 -0700 |
| Subject: perf/x86/rapl: Fix RAPL config variable bug |
| |
| From: Stephane Eranian <eranian@google.com> |
| |
| [ 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> |
| --- |
| 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 b418ef6878796..726e83c0a31a1 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/ |
| -- |
| 2.25.1 |
| |
