summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/Kconfig11
-rw-r--r--arch/x86/events/Kconfig (renamed from arch/x86/Kconfig.perf)9
2 files changed, 10 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---
diff --git a/arch/x86/Kconfig.perf b/arch/x86/events/Kconfig
index 7d29dd75d07b..98397db5ceae 100644
--- a/arch/x86/Kconfig.perf
+++ b/arch/x86/events/Kconfig
@@ -24,4 +24,13 @@ config PERF_EVENTS_INTEL_CSTATE
Include support for Intel cstate performance events for power
monitoring on modern processors.
+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.
+
endmenu