summaryrefslogtreecommitdiffstats
path: root/arch/x86/Kconfig
diff options
context:
space:
mode:
authorPeter Zijlstra <peterz@infradead.org>2016-03-29 14:30:35 +0200
committerIngo Molnar <mingo@kernel.org>2016-03-31 10:30:40 +0200
commit07dc900e17a94681877b5797ce62ba97fa170400 (patch)
treee6d334501b2b99b3cb71110d290da7d5084c6490 /arch/x86/Kconfig
parentaaf248848db503927644d28e239bc399ed45959f (diff)
downloadlinux-07dc900e17a94681877b5797ce62ba97fa170400.tar.bz2
perf/x86: Move Kconfig.perf and other perf configuration bits to events/Kconfig
Ingo says: "If we do a separate file we should have it in arch/x86/events/Kconfig (not in arch/x86/Kconfig.perf), and also move some of the other bits, such as PERF_EVENTS_AMD_POWER?" Suggested-by: Ingo Molnar <mingo@kernel.org> Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com> Cc: Arnaldo Carvalho de Melo <acme@redhat.com> Cc: Jiri Olsa <jolsa@redhat.com> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Stephane Eranian <eranian@google.com> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Vince Weaver <vincent.weaver@maine.edu> Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/Kconfig')
-rw-r--r--arch/x86/Kconfig11
1 files changed, 1 insertions, 10 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 496218b8236b..c2d34578a0a4 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -1038,7 +1038,7 @@ config X86_THERMAL_VECTOR
def_bool y
depends on X86_MCE_INTEL
-source "arch/x86/Kconfig.perf"
+source "arch/x86/events/Kconfig"
config X86_LEGACY_VM86
bool "Legacy VM86 support"
@@ -1204,15 +1204,6 @@ config MICROCODE_OLD_INTERFACE
def_bool y
depends on MICROCODE
-config PERF_EVENTS_AMD_POWER
- depends on PERF_EVENTS && CPU_SUP_AMD
- tristate "AMD Processor Power Reporting Mechanism"
- ---help---
- Provide power reporting mechanism support for AMD processors.
- Currently, it leverages X86_FEATURE_ACC_POWER
- (CPUID Fn8000_0007_EDX[12]) interface to calculate the
- average power consumption on Family 15h processors.
-
config X86_MSR
tristate "/dev/cpu/*/msr - Model-specific register support"
---help---