On Fri, May 15, 2020 at 02:57:31PM -0700, Stephane Eranian wrote:
> To prepare for support of both Intel and AMD RAPL.
> Move rapl.c to arch/x86/events. Rename config option.
> Fixup header paths.
>
> Signed-off-by: Stephane Eranian <eran...@google.com>
> ---
> arch/x86/events/Kconfig | 8 ++++----
> arch/x86/events/Makefile | 1 +
> arch/x86/events/intel/Makefile | 2 --
> arch/x86/events/{intel => }/rapl.c | 9 ++++++---
> 4 files changed, 11 insertions(+), 9 deletions(-)
> rename arch/x86/events/{intel => }/rapl.c (98%)
>
> diff --git a/arch/x86/events/Kconfig b/arch/x86/events/Kconfig
> index 9a7a1446cb3a0..e542c32b0a55f 100644
> --- a/arch/x86/events/Kconfig
> +++ b/arch/x86/events/Kconfig
> @@ -9,12 +9,12 @@ config PERF_EVENTS_INTEL_UNCORE
> Include support for Intel uncore performance events. These are
> available on NehalemEX and more modern processors.
>
> -config PERF_EVENTS_INTEL_RAPL
> - tristate "Intel rapl performance events"
> - depends on PERF_EVENTS && CPU_SUP_INTEL && PCI
> +config PERF_EVENTS_X86_RAPL
This is going to make everybody's kconfig prompt for this again. Best to
to a backwards compat thing or just leave it have Intel in the name.
