| Message ID | 1428547976-24890-1-git-send-email-anton@samba.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | af9feebe60add19fdd15adee80ac5b4eeb2a489b |
| Delegated to: | Michael Ellerman |
| Headers | show |
On 09.04.15 12:52:55, Anton Blanchard wrote: > 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> Please pass this patch along with patch 2 of this series (ppc tree or so). Thanks, -Robert > --- > arch/Kconfig | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/arch/Kconfig b/arch/Kconfig > index 05d7a8a..0cc605d 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" > -- > 2.1.0 >
diff --git a/arch/Kconfig b/arch/Kconfig index 05d7a8a..0cc605d 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"
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> --- arch/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)