HAVE_PERF_EVENTS_NMI is used for two things - the oprofile NMI timer and the hard lockup detector.
Create HAVE_OPROFILE_NMI_TIMER so an architecture can select them separately. On ppc64 we want to add the hard lockup detector, but not the oprofile NMI timer fallback. Signed-off-by: Anton Blanchard <an...@samba.org> --- Resending, because I forgot to cc the x86 guys. How would you like us to handle it? Michael Ellerman says we can put it in a topic branch, or just merge it and cop any conflicts. diff --git a/arch/Kconfig b/arch/Kconfig index 05d7a8a..3d50e42 100644 --- a/arch/Kconfig +++ b/arch/Kconfig @@ -30,9 +30,12 @@ config OPROFILE_EVENT_MULTIPLEX config HAVE_OPROFILE bool +config HAVE_OPROFILE_NMI_TIMER + bool + config OPROFILE_NMI_TIMER def_bool y - depends on PERF_EVENTS && HAVE_PERF_EVENTS_NMI + depends on PERF_EVENTS && HAVE_OPROFILE_NMI_TIMER config KPROBES bool "Kprobes" diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index ba397bd..98d9c72 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -138,6 +138,7 @@ config X86 select HAVE_ACPI_APEI_NMI if ACPI select ACPI_LEGACY_TABLES_LOOKUP if ACPI select X86_FEATURE_NAMES if PROC_FS + select HAVE_OPROFILE_NMI_TIMER config INSTRUCTION_DECODER def_bool y -- 2.1.0 _______________________________________________ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev