linux-kernel - [PATCH] x86: fix build in !CONFIG_KEXEC

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Date:	Tue, 11 Aug 2015 15:35:35 +0200
From:	Vitaly Kuznetsov <vkuznets@...hat.com>
To:	x86@...nel.org
Cc:	Thomas Gleixner <tglx@...utronix.de>,
	Ingo Molnar <mingo@...hat.com>,
	"H. Peter Anvin" <hpa@...or.com>, linux-kernel@...r.kernel.org,
	Greg KH <gregkh@...uxfoundation.org>,
	"K. Y. Srinivasan" <kys@...rosoft.com>,
	Jim Davis <jim.epost@...il.com>,
	linux-next <linux-next@...r.kernel.org>
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@...il.com>
Signed-off-by: Vitaly Kuznetsov <vkuznets@...hat.com>
---
 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

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/