]> git.baikalelectronics.ru Git - kernel.git/commit
powerpc: Fix powerpc-specific watchdog build configuration
authorNicholas Piggin <npiggin@gmail.com>
Tue, 1 Aug 2017 12:00:52 +0000 (22:00 +1000)
committerMichael Ellerman <mpe@ellerman.id.au>
Thu, 10 Aug 2017 12:30:01 +0000 (22:30 +1000)
commit50fc52390f031c35d64811e9d54c7adc289481ac
treeaa8edb4aeffac494078dfc0c605924a2c221d605
parent27adf64cf9def3d0051366bc812532d15aefaf6a
powerpc: Fix powerpc-specific watchdog build configuration

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: 3ac087868b ("powerpc/64s: implement arch-specific hardlockup watchdog")
Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
arch/powerpc/Kconfig
arch/powerpc/kernel/Makefile
arch/powerpc/kernel/exceptions-64s.S