[XEN] Remove unnecessary FORCE_CRASH() macro.

Signed-off-by: Keir Fraser <keir@xensource.com>

diff --git a/xen/drivers/char/console.c b/xen/drivers/char/console.c
index d6c84278eb05e5e2e47d5dbc3015b8e41a8f14c9..6a97fc2965aa274fe55bc3fbbfcbc5b524aec9a6 100644 (file)
--- a/xen/drivers/char/console.c
+++ b/xen/drivers/char/console.c
@@ -880,9 +880,9 @@ void panic(const char *fmt, ...)
 void __bug(char *file, int line)
 {
     console_start_sync();
-    debugtrace_dump();
     printk("BUG at %s:%d\n", file, line);
-    FORCE_CRASH();
+    dump_execution_state();
+    panic("BUG at %s:%d\n", file, line);
     for ( ; ; ) ;
 }
 

diff --git a/xen/include/asm-ia64/config.h b/xen/include/asm-ia64/config.h
index 9cb2aeaea32fb02991291eaeb8a15126593150ab..92bfd364b1974e7702a1cebf2939ed7e760c738d 100644 (file)
--- a/xen/include/asm-ia64/config.h
+++ b/xen/include/asm-ia64/config.h
@@ -271,13 +271,6 @@ struct screen_info { };
 #endif /* __ASSEMBLY__ */
 #endif /* __XEN_IA64_CONFIG_H__ */
 
-#ifndef __ASSEMBLY__
-#include <linux/linkage.h>
-#define FORCE_CRASH()  asm("break.m 0;;");
-#else
-#define FORCE_CRASH    break.m 0;;
-#endif
-
 /* Allow .serialize.data/instruction in asm files.
    Old as doesn't handle this.  */
 #define HAVE_SERIALIZE_DIRECTIVE

diff --git a/xen/include/asm-ia64/debugger.h b/xen/include/asm-ia64/debugger.h
index e320ff68cca15b6b94055cb59f943e5140a70392..104cea9bfcfbe49f8ef77c829b9288125ce0c353 100644 (file)
--- a/xen/include/asm-ia64/debugger.h
+++ b/xen/include/asm-ia64/debugger.h
@@ -23,7 +23,6 @@
 #define __ASM_DEBUGGER_H__
 
 // this number is an arbitary number which is not used for any other purpose
-// __builtin_trap(), FORCE_CRASH() 0x0
 // ski  0x80001, 0x80002
 // kdb  0x80100, 0x80101
 // kprobe 0x80200, jprobe 0x80300

diff --git a/xen/include/asm-powerpc/powerpc64/config.h b/xen/include/asm-powerpc/powerpc64/config.h
index cf16dac47989a13bf121c679eea1a29b67b7dfc6..86183d1441bd79c0e98d6239e0788c7f0d1e9554 100644 (file)
--- a/xen/include/asm-powerpc/powerpc64/config.h
+++ b/xen/include/asm-powerpc/powerpc64/config.h
@@ -36,10 +36,4 @@
 #define HAS_FLOAT 1
 #define HAS_VMX 1
 
-#ifndef __ASSEMBLY__
-
-#define FORCE_CRASH() __asm__ __volatile__ ( "trap" )
-
-#endif /* __ASSEMBLY__ */
-
 #endif

diff --git a/xen/include/asm-x86/config.h b/xen/include/asm-x86/config.h
index 879bdbf80bd611c6c5494ba17fc90bb2b6f6f1f2..f3b9cbe8b4b4933e283109de6e78a5d8d3f4f04b 100644 (file)
--- a/xen/include/asm-x86/config.h
+++ b/xen/include/asm-x86/config.h
@@ -86,13 +86,6 @@
 
 #ifndef __ASSEMBLY__
 extern unsigned long _end; /* standard ELF symbol */
-
-static inline void FORCE_CRASH(void) __attribute__((noreturn,always_inline)); 
-static inline void FORCE_CRASH(void) 
-{
-    __asm__ __volatile__ ( "ud2" );
-    while(1);
-}
 #endif /* __ASSEMBLY__ */
 
 #if defined(__x86_64__)