Skip to content

Commit 07dc900

Browse files
Peter ZijlstraIngo Molnar
authored andcommitted
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 <[email protected]> Signed-off-by: Peter Zijlstra (Intel) <[email protected]> Cc: Alexander Shishkin <[email protected]> Cc: Arnaldo Carvalho de Melo <[email protected]> Cc: Jiri Olsa <[email protected]> Cc: Linus Torvalds <[email protected]> Cc: Peter Zijlstra <[email protected]> Cc: Stephane Eranian <[email protected]> Cc: Thomas Gleixner <[email protected]> Cc: Vince Weaver <[email protected]> Signed-off-by: Ingo Molnar <[email protected]>
1 parent aaf2488 commit 07dc900

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

arch/x86/Kconfig

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1038,7 +1038,7 @@ config X86_THERMAL_VECTOR
10381038
def_bool y
10391039
depends on X86_MCE_INTEL
10401040

1041-
source "arch/x86/Kconfig.perf"
1041+
source "arch/x86/events/Kconfig"
10421042

10431043
config X86_LEGACY_VM86
10441044
bool "Legacy VM86 support"
@@ -1204,15 +1204,6 @@ config MICROCODE_OLD_INTERFACE
12041204
def_bool y
12051205
depends on MICROCODE
12061206

1207-
config PERF_EVENTS_AMD_POWER
1208-
depends on PERF_EVENTS && CPU_SUP_AMD
1209-
tristate "AMD Processor Power Reporting Mechanism"
1210-
---help---
1211-
Provide power reporting mechanism support for AMD processors.
1212-
Currently, it leverages X86_FEATURE_ACC_POWER
1213-
(CPUID Fn8000_0007_EDX[12]) interface to calculate the
1214-
average power consumption on Family 15h processors.
1215-
12161207
config X86_MSR
12171208
tristate "/dev/cpu/*/msr - Model-specific register support"
12181209
---help---

arch/x86/Kconfig.perf renamed to arch/x86/events/Kconfig

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,13 @@ config PERF_EVENTS_INTEL_CSTATE
2424
Include support for Intel cstate performance events for power
2525
monitoring on modern processors.
2626

27+
config PERF_EVENTS_AMD_POWER
28+
depends on PERF_EVENTS && CPU_SUP_AMD
29+
tristate "AMD Processor Power Reporting Mechanism"
30+
---help---
31+
Provide power reporting mechanism support for AMD processors.
32+
Currently, it leverages X86_FEATURE_ACC_POWER
33+
(CPUID Fn8000_0007_EDX[12]) interface to calculate the
34+
average power consumption on Family 15h processors.
35+
2736
endmenu

0 commit comments

Comments
 (0)