> -----Original Message----- > From: Vitaly Kuznetsov [mailto:vkuznets@xxxxxxxxxx] > Sent: Tuesday, August 11, 2015 6:36 AM > To: x86@xxxxxxxxxx > Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>; Ingo Molnar > <mingo@xxxxxxxxxx>; H. Peter Anvin <hpa@xxxxxxxxx>; linux- > kernel@xxxxxxxxxxxxxxx; Greg KH <gregkh@xxxxxxxxxxxxxxxxxxx>; KY > Srinivasan <kys@xxxxxxxxxxxxx>; Jim Davis <jim.epost@xxxxxxxxx>; linux- > next <linux-next@xxxxxxxxxxxxxxx> > Subject: [PATCH] x86: fix build in !CONFIG_KEXEC_CORE case > > Recent changes in Hyper-V driver ("Drivers: hv: vmbus: add special crash > handler") broke the build when CONFIG_KEXEC_CORE is not set. These > changes, however, only reveal the previously existent issue: when > CONFIG_KEXEC_CORE is not defined kernel/kexec.c is not being included in > the build and native_machine_crash_shutdown() defined in asm/reboot.h > has > no implementation. > > Reported-by: Jim Davis <jim.epost@xxxxxxxxx> > Signed-off-by: Vitaly Kuznetsov <vkuznets@xxxxxxxxxx> > --- > arch/x86/include/asm/reboot.h | 9 ++++++++- > 1 file changed, 8 insertions(+), 1 deletion(-) > > diff --git a/arch/x86/include/asm/reboot.h b/arch/x86/include/asm/reboot.h > index a82c4f1..a6c1124 100644 > --- a/arch/x86/include/asm/reboot.h > +++ b/arch/x86/include/asm/reboot.h > @@ -16,8 +16,15 @@ struct machine_ops { > > extern struct machine_ops machine_ops; > > -void native_machine_crash_shutdown(struct pt_regs *regs); > void native_machine_shutdown(void); > +#ifdef CONFIG_KEXEC_CORE > +void native_machine_crash_shutdown(struct pt_regs *regs); > +#else > +static inline void native_machine_crash_shutdown(struct pt_regs *regs) > +{ > + native_machine_shutdown(); > +} > +#endif > void __noreturn machine_real_restart(unsigned int type); > /* These must match dispatch in arch/x86/realmore/rm/reboot.S */ > #define MRR_BIOS 0 > -- > 2.4.3 This patch fixes a build issue; please apply. Regards, K. Y -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
