* [PATCH] perf/x86/rapl: fix rapl config variable bug
@ 2020-05-28 20:16 Stephane Eranian
2020-05-28 21:30 ` Kim Phillips
2020-06-02 11:40 ` [tip: perf/urgent] perf/x86/rapl: Fix RAPL " tip-bot2 for Stephane Eranian
0 siblings, 2 replies; 4+ messages in thread
From: Stephane Eranian @ 2020-05-28 20:16 UTC (permalink / raw)
To: linux-kernel; +Cc: peterz, mingo, irogers, kim.phillips, jolsa
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
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] perf/x86/rapl: fix rapl config variable bug
2020-05-28 20:16 [PATCH] perf/x86/rapl: fix rapl config variable bug Stephane Eranian
@ 2020-05-28 21:30 ` Kim Phillips
2020-06-01 19:44 ` Stephane Eranian
2020-06-02 11:40 ` [tip: perf/urgent] perf/x86/rapl: Fix RAPL " tip-bot2 for Stephane Eranian
1 sibling, 1 reply; 4+ messages in thread
From: Kim Phillips @ 2020-05-28 21:30 UTC (permalink / raw)
To: Stephane Eranian, linux-kernel; +Cc: peterz, mingo, irogers, jolsa
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
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] perf/x86/rapl: fix rapl config variable bug
2020-05-28 21:30 ` Kim Phillips
@ 2020-06-01 19:44 ` Stephane Eranian
0 siblings, 0 replies; 4+ messages in thread
From: Stephane Eranian @ 2020-06-01 19:44 UTC (permalink / raw)
To: mingo; +Cc: LKML, Kim Phillips, Peter Zijlstra, Ian Rogers, Jiri Olsa
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
^ permalink raw reply [flat|nested] 4+ messages in thread
* [tip: perf/urgent] perf/x86/rapl: Fix RAPL config variable bug
2020-05-28 20:16 [PATCH] perf/x86/rapl: fix rapl config variable bug Stephane Eranian
2020-05-28 21:30 ` Kim Phillips
@ 2020-06-02 11:40 ` tip-bot2 for Stephane Eranian
1 sibling, 0 replies; 4+ messages in thread
From: tip-bot2 for Stephane Eranian @ 2020-06-02 11:40 UTC (permalink / raw)
To: linux-tip-commits; +Cc: Ingo Molnar, Kim Phillips, Peter Zijlstra, x86, LKML
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/
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-06-02 11:41 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-05-28 20:16 [PATCH] perf/x86/rapl: fix rapl config variable bug Stephane Eranian
2020-05-28 21:30 ` Kim Phillips
2020-06-01 19:44 ` Stephane Eranian
2020-06-02 11:40 ` [tip: perf/urgent] perf/x86/rapl: Fix RAPL " tip-bot2 for Stephane Eranian
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).