Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 07dc900e authored by Peter Zijlstra's avatar Peter Zijlstra Committed by Ingo Molnar
Browse files

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: default avatarIngo Molnar <mingo@kernel.org>
Signed-off-by: default avatarPeter 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: default avatarIngo Molnar <mingo@kernel.org>
parent aaf24884

arch/x86/Kconfig

+1 −10
Original line number Diff line number Diff line
@@ -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---

arch/x86/Kconfig.perf→arch/x86/events/Kconfig

+9 −0
Original line number Diff line number Diff line
@@ -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