From: Andrew Cooper <andrew.cooper3@citrix.com>
Date: Wed, 21 Nov 2018 17:18:02 +0000 (+0000)
Subject: xen/common: Drop unnecessary #ifdef CONFIG_KEXEC
X-Git-Tag: archive/raspbian/4.14.0+80-gd101b417b7-1+rpi1^2~63^2~2846
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=f20ae50016045a03599a4c2259c2ec8cb5c3646d;p=xen.git

xen/common: Drop unnecessary #ifdef CONFIG_KEXEC

kexec.h itself has suitable stubs for the !CONFIG_KEXEC case, so calls to
kexec_crash() don't need guarding.

Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
Acked-by: Wei Liu <wei.liu2@citrix.com>
---

diff --git a/xen/common/shutdown.c b/xen/common/shutdown.c
index 009a70c2fb..2ed4d62214 100644
--- a/xen/common/shutdown.c
+++ b/xen/common/shutdown.c
@@ -6,9 +6,7 @@
 #include <xen/watchdog.h>
 #include <xen/shutdown.h>
 #include <xen/console.h>
-#ifdef CONFIG_KEXEC
 #include <xen/kexec.h>
-#endif
 #include <asm/debugger.h>
 #include <public/sched.h>
 
@@ -44,9 +42,7 @@ void hwdom_shutdown(u8 reason)
     case SHUTDOWN_crash:
         debugger_trap_immediate();
         printk("Hardware Dom%u crashed: ", hardware_domain->domain_id);
-#ifdef CONFIG_KEXEC
         kexec_crash();
-#endif
         maybe_reboot();
         break; /* not reached */
 
@@ -59,9 +55,7 @@ void hwdom_shutdown(u8 reason)
     case SHUTDOWN_watchdog:
         printk("Hardware Dom%u shutdown: watchdog rebooting machine\n",
                hardware_domain->domain_id);
-#ifdef CONFIG_KEXEC
         kexec_crash();
-#endif
         machine_restart(0);
         break; /* not reached */
 
diff --git a/xen/drivers/char/console.c b/xen/drivers/char/console.c
index f39a37e025..675193a272 100644
--- a/xen/drivers/char/console.c
+++ b/xen/drivers/char/console.c
@@ -1338,9 +1338,7 @@ void panic(const char *fmt, ...)
 
     debugger_trap_immediate();
 
-#ifdef CONFIG_KEXEC
     kexec_crash();
-#endif
 
     if ( opt_noreboot )
         machine_halt();