[Xen-changelog] [xen staging] xen/common: Drop unnecessary #ifdef CONFIG_KEXEC

[patchbot@xxxxxxx]

commit f20ae50016045a03599a4c2259c2ec8cb5c3646d
Author:     Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
AuthorDate: Wed Nov 21 17:18:02 2018 +0000
Commit:     Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
CommitDate: Thu Nov 22 18:30:56 2018 +0000

    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@xxxxxxxxxx>
    Acked-by: Wei Liu <wei.liu2@xxxxxxxxxx>
---
 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 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();
--
generated by git-patchbot for /home/xen/git/xen.git#staging

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/xen-changelog