From: Anton Blanchard <anton@samba.org>
Date: Thu, 9 Apr 2015 02:52:55 +0000 (+1000)
Subject: oprofile: Disable oprofile NMI timer on ppc64
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=af9feebe60add19fdd15adee80ac5b4eeb2a489b;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

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>
---

diff --git a/arch/Kconfig b/arch/Kconfig
index 05d7a8a458d5..0cc605daa449 100644
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -32,7 +32,7 @@ config HAVE_OPROFILE
 
 config OPROFILE_NMI_TIMER
 	def_bool y
-	depends on PERF_EVENTS && HAVE_PERF_EVENTS_NMI
+	depends on PERF_EVENTS && HAVE_PERF_EVENTS_NMI && !PPC64
 
 config KPROBES
 	bool "Kprobes"