[PATCH] perf/x86/rapl: fix rapl config variable bug

[PATCH] perf/x86/rapl: fix rapl config variable bug

[Stephane Eranian]

This patch fixes a bug introduced by:

commit 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>

---
 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 12c42eba77ec3..9933c0e8e97a9 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.27.0.rc2.251.g90737beb825-goog

Re: [PATCH] perf/x86/rapl: fix rapl config variable bug

[Kim Phillips]

On 5/28/20 3:16 PM, Stephane Eranian wrote:
> This patch fixes a bug introduced by:
> 
> commit 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>
> 
> ---

Tested-by: Kim Phillips <kim.phillips@amd.com>

Thanks,

Kim

Re: [PATCH] perf/x86/rapl: fix rapl config variable bug

[Stephane Eranian]

On Thu, May 28, 2020 at 2:30 PM Kim Phillips <kim.phillips@amd.com> wrote:
>
> On 5/28/20 3:16 PM, Stephane Eranian wrote:
> > This patch fixes a bug introduced by:
> >
> > commit 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>
> >
> > ---
>
> Tested-by: Kim Phillips <kim.phillips@amd.com>
>
Without this patch, the rapl.c module does not get compiled.
Please apply.
Thanks.

> Thanks,
>
> Kim

[tip: perf/urgent] perf/x86/rapl: Fix RAPL config variable bug

[tip-bot2 for Stephane Eranian]

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 <eranian@google.com>
AuthorDate:    Thu, 28 May 2020 13:16:14 -07:00
Committer:     Ingo Molnar <mingo@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 <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
---
 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/