]> git.baikalelectronics.ru Git - kernel.git/commitdiff
powerpc/64s: ppc_save_regs is now needed for all 64s builds
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 2 Nov 2017 06:49:36 +0000 (17:49 +1100)
committerMichael Ellerman <mpe@ellerman.id.au>
Sun, 12 Nov 2017 12:44:36 +0000 (23:44 +1100)
Commit 78adf6c214f0 ("powerpc/64s: Implement system reset idle wakeup
reason"), added a call to ppc_save_regs() in the book3s code.

ppc_save_regs() is only built if XMON and/or KEXEC_CORE are enabled,
which is usually the case, however if they're not enabled then the
build breaks.

Fix it by making the Makefile check also build ppc_save_regs.o if
CONFIG_PPC_BOOK3S is enabled.

Fixes: 78adf6c214f0 ("powerpc/64s: Implement system reset idle wakeup reason")
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
[mpe: Write change log]
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
arch/powerpc/kernel/Makefile

index 91960f83039c816b674d0b3f07f09808a2af39cb..34b6e729f38c98cc8936323243a3a38920a2f5de 100644 (file)
@@ -128,7 +128,7 @@ obj64-$(CONFIG_PPC_TRANSACTIONAL_MEM)       += tm.o
 obj-$(CONFIG_PPC64)            += $(obj64-y)
 obj-$(CONFIG_PPC32)            += $(obj32-y)
 
-ifneq ($(CONFIG_XMON)$(CONFIG_KEXEC_CORE),)
+ifneq ($(CONFIG_XMON)$(CONFIG_KEXEC_CORE)(CONFIG_PPC_BOOK3S),)
 obj-y                          += ppc_save_regs.o
 endif