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

Commit 92e5aae4 authored by Nicholas Piggin's avatar Nicholas Piggin Committed by Linus Torvalds
Browse files

kernel/watchdog: fix Kconfig constraints for perf hardlockup watchdog 

Commit 05a4a952 ("kernel/watchdog: split up config options") lost
the perf-based hardlockup detector's dependency on PERF_EVENTS, which
can result in broken builds with some powerpc configurations.

Restore the dependency.  Add it in for x86 too, despite x86 always
selecting PERF_EVENTS it seems reasonable to make the dependency
explicit.

Link: http://lkml.kernel.org/r/20170810114452.6673-1-npiggin@gmail.com


Fixes: 05a4a952 ("kernel/watchdog: split up config options")
Signed-off-by: default avatarNicholas Piggin <npiggin@gmail.com>
Acked-by: default avatarDon Zickus <dzickus@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 739f79fc

arch/powerpc/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -199,7 +199,7 @@ config PPC 
	select HAVE_OPTPROBES			if PPC64

	select HAVE_PERF_EVENTS

	select HAVE_PERF_EVENTS_NMI		if PPC64

	select HAVE_HARDLOCKUP_DETECTOR_PERF	if HAVE_PERF_EVENTS_NMI && !HAVE_HARDLOCKUP_DETECTOR_ARCH

	select HAVE_HARDLOCKUP_DETECTOR_PERF	if PERF_EVENTS && HAVE_PERF_EVENTS_NMI && !HAVE_HARDLOCKUP_DETECTOR_ARCH

	select HAVE_PERF_REGS

	select HAVE_PERF_USER_STACK_DUMP

	select HAVE_RCU_TABLE_FREE		if SMP

arch/x86/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -163,7 +163,7 @@ config X86 
	select HAVE_PCSPKR_PLATFORM

	select HAVE_PERF_EVENTS

	select HAVE_PERF_EVENTS_NMI

	select HAVE_HARDLOCKUP_DETECTOR_PERF	if HAVE_PERF_EVENTS_NMI

	select HAVE_HARDLOCKUP_DETECTOR_PERF	if PERF_EVENTS && HAVE_PERF_EVENTS_NMI

	select HAVE_PERF_REGS

	select HAVE_PERF_USER_STACK_DUMP

	select HAVE_REGS_AND_STACK_ACCESS_API