Commit af9feebe authored Apr 09, 2015 by Anton Blanchard Committed by Michael Ellerman Apr 11, 2015

oprofile: Disable oprofile NMI timer on ppc64



We want to enable the hard lockup detector on ppc64, but right now
that enables the oprofile NMI timer too.

We'd prefer not to enable the oprofile NMI timer, it adds another
element to our PMU testing and it requires us to increase our
exported symbols (eg cpu_khz).

Modify the config entry for OPROFILE_NMI_TIMER to disable it on PPC64.

Signed-off-by: Anton Blanchard <anton@samba.org>
Acked-by: Robert Richter <rric@kernel.org>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>

parent b816ce67

arch/Kconfig

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -32,7 +32,7 @@ config HAVE_OPROFILE

	config OPROFILE_NMI_TIMER		config OPROFILE_NMI_TIMER
	def_bool y		def_bool y
	depends on PERF_EVENTS && HAVE_PERF_EVENTS_NMI		depends on PERF_EVENTS && HAVE_PERF_EVENTS_NMI && !PPC64

	config KPROBES		config KPROBES
	bool "Kprobes"		bool "Kprobes"