powerpc: Fix powerpc-specific watchdog build configuration

Browse source

The powerpc kernel/watchdog.o should be built when HARDLOCKUP_DETECTOR
and HAVE_HARDLOCKUP_DETECTOR_ARCH are both selected. If only the former
is selected, then the generic perf watchdog has been selected.

To simplify this check, introduce a new Kconfig symbol PPC_WATCHDOG that
depends on both. This Kconfig option means the powerpc specific
watchdog is enabled.

Without this patch, Book3E will attempt to build the powerpc watchdog.

Fixes: 2104180a53 ("powerpc/64s: implement arch-specific hardlockup watchdog")
Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>

...

This commit is contained in:

Nicholas Piggin 2017-08-01 22:00:52 +10:00 • committed by Michael Ellerman

parent f886f0f6e0

commit 75eb767e4c

3 changed files with 15 additions and 4 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

11

arch/powerpc/Kconfig

View file

2

arch/powerpc/kernel/Makefile

View file

6

arch/powerpc/kernel/exceptions-64s.S

View file