| Message ID | 20171102174936.7cc061cc@canb.auug.org.au (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | fc2a5a6161a26b386eb0936b74a852ff83793fb6 |
| Headers | show |
| Series | linux-next: build failure after merge of the powerpc tree | expand |
On Thu, 2017-11-02 at 06:49:36 UTC, Stephen Rothwell wrote: > Hi all, > > After merging the powerpc tree, today's linux-next build (powerpc64 > allnoconfig) failed like this: > > arch/powerpc/kernel/irq.o: In function `.replay_system_reset': > irq.c:(.text+0x10): undefined reference to `.ppc_save_regs' > > Caused by commit > > 78adf6c214f0 ("powerpc/64s: Implement system reset idle wakeup reason") > > I have applied the following fix patch: > > From: Stephen Rothwell <sfr@canb.auug.org.au> > Date: Thu, 2 Nov 2017 17:45:18 +1100 > Subject: [PATCH] powerpc/64s: ppc_save_regs is now needed for all 64s builds > > Fixes: 78adf6c214f0 ("powerpc/64s: Implement system reset idle wakeup reason") > Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Applied to powerpc next, thanks. https://git.kernel.org/powerpc/c/fc2a5a6161a26b386eb0936b74a852 cheers
diff --git a/arch/powerpc/kernel/Makefile b/arch/powerpc/kernel/Makefile index 91960f83039c..34b6e729f38c 100644 --- a/arch/powerpc/kernel/Makefile +++ b/arch/powerpc/kernel/Makefile @@ -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
Hi all, After merging the powerpc tree, today's linux-next build (powerpc64 allnoconfig) failed like this: arch/powerpc/kernel/irq.o: In function `.replay_system_reset': irq.c:(.text+0x10): undefined reference to `.ppc_save_regs' Caused by commit 78adf6c214f0 ("powerpc/64s: Implement system reset idle wakeup reason") I have applied the following fix patch: From: Stephen Rothwell <sfr@canb.auug.org.au> Date: Thu, 2 Nov 2017 17:45:18 +1100 Subject: [PATCH] powerpc/64s: ppc_save_regs is now needed for all 64s builds Fixes: 78adf6c214f0 ("powerpc/64s: Implement system reset idle wakeup reason") Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> --- arch/powerpc/kernel/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)