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

Commit c01d4323 authored by Frederic Weisbecker's avatar Frederic Weisbecker
Browse files

lockup_detector: Adapt CONFIG_PERF_EVENT_NMI to other archs 



CONFIG_PERF_EVENT_NMI is something that need to be enabled from the
arch. This is fine on x86 as PERF_EVENTS is builtin but if other
archs select it, they will need to handle the PERF_EVENTS dependency.

Instead, handle the dependency in the generic layer:

- archs need to tell what they support through HAVE_PERF_EVENTS_NMI
- Enable magically PERF_EVENTS_NMI if we have PERF_EVENTS and
  HAVE_PERF_EVENTS_NMI.

Signed-off-by: default avatarFrederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Don Zickus <dzickus@redhat.com>
Cc: Cyrill Gorcunov <gorcunov@gmail.com>
parent e16bb1d7

arch/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -145,4 +145,7 @@ config HAVE_HW_BREAKPOINT 
config HAVE_USER_RETURN_NOTIFIER

	bool



config HAVE_PERF_EVENTS_NMI

	bool



source "kernel/gcov/Kconfig"

arch/x86/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ config X86 
	select HAVE_KERNEL_LZO

	select HAVE_HW_BREAKPOINT

	select PERF_EVENTS

	select PERF_EVENTS_NMI

	select HAVE_PERF_EVENTS_NMI

	select ANON_INODES

	select HAVE_ARCH_KMEMCHECK

	select HAVE_USER_RETURN_NOTIFIER

init/Kconfig

+1 −2
Original line number Diff line number Diff line
@@ -943,8 +943,7 @@ config PERF_USE_VMALLOC 
	  See tools/perf/design.txt for details



config PERF_EVENTS_NMI

	bool

	depends on PERF_EVENTS

	def_bool PERF_EVENTS && HAVE_PERF_EVENTS_NMI

	help

	  System hardware can generate an NMI using the perf event

	  subsystem.  Also has support for calculating CPU cycle events