[Xen-devel] [PATCH] xen/common: Drop unnecessary #ifdef CONFIG_KEXEC

[Andrew Cooper <andrew.cooper3@xxxxxxxxxx>]

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@xxxxxxxxxx>
---
CC: George Dunlap <George.Dunlap@xxxxxxxxxxxxx>
CC: Jan Beulich <JBeulich@xxxxxxxx>
CC: Konrad Rzeszutek Wilk <konrad.wilk@xxxxxxxxxx>
CC: Stefano Stabellini <sstabellini@xxxxxxxxxx>
CC: Tim Deegan <tim@xxxxxxx>
CC: Wei Liu <wei.liu2@xxxxxxxxxx>
CC: Julien Grall <julien.grall@xxxxxxx>
---
 xen/common/shutdown.c      | 6 ------
 xen/drivers/char/console.c | 2 --
 2 files changed, 8 deletions(-)

diff --git a/xen/common/shutdown.c b/xen/common/shutdown.c
index 009a70c..2ed4d62 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 f39a37e..675193a 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();
-- 
2.1.4


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/mailman/listinfo/xen-devel