# HG changeset patch
# User kfraser@xxxxxxxxxxxxxxxxxxxxx
# Node ID 0c332cf81e644e75662288d433bc0c97f9ac25cb
# Parent cb8eeadd8eaee16924a4a02a1955c5145f0bfcec
[XEN] Remove unnecessary FORCE_CRASH() macro.
Signed-off-by: Keir Fraser <keir@xxxxxxxxxxxxx>
---
xen/drivers/char/console.c | 4 ++--
xen/include/asm-ia64/config.h | 7 -------
xen/include/asm-ia64/debugger.h | 1 -
xen/include/asm-powerpc/powerpc64/config.h | 6 ------
xen/include/asm-x86/config.h | 7 -------
5 files changed, 2 insertions(+), 23 deletions(-)
diff -r cb8eeadd8eae -r 0c332cf81e64 xen/drivers/char/console.c
--- a/xen/drivers/char/console.c Tue Nov 07 10:37:30 2006 +0000
+++ b/xen/drivers/char/console.c Tue Nov 07 10:41:35 2006 +0000
@@ -880,9 +880,9 @@ void __bug(char *file, int line)
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 -r cb8eeadd8eae -r 0c332cf81e64 xen/include/asm-ia64/config.h
--- a/xen/include/asm-ia64/config.h Tue Nov 07 10:37:30 2006 +0000
+++ b/xen/include/asm-ia64/config.h Tue Nov 07 10:41:35 2006 +0000
@@ -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 -r cb8eeadd8eae -r 0c332cf81e64 xen/include/asm-ia64/debugger.h
--- a/xen/include/asm-ia64/debugger.h Tue Nov 07 10:37:30 2006 +0000
+++ b/xen/include/asm-ia64/debugger.h Tue Nov 07 10:41:35 2006 +0000
@@ -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 -r cb8eeadd8eae -r 0c332cf81e64 xen/include/asm-powerpc/powerpc64/config.h
--- a/xen/include/asm-powerpc/powerpc64/config.h Tue Nov 07 10:37:30
2006 +0000
+++ b/xen/include/asm-powerpc/powerpc64/config.h Tue Nov 07 10:41:35
2006 +0000
@@ -36,10 +36,4 @@
#define HAS_FLOAT 1
#define HAS_VMX 1
-#ifndef __ASSEMBLY__
-
-#define FORCE_CRASH() __asm__ __volatile__ ( "trap" )
-
-#endif /* __ASSEMBLY__ */
-
#endif
diff -r cb8eeadd8eae -r 0c332cf81e64 xen/include/asm-x86/config.h
--- a/xen/include/asm-x86/config.h Tue Nov 07 10:37:30 2006 +0000
+++ b/xen/include/asm-x86/config.h Tue Nov 07 10:41:35 2006 +0000
@@ -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__)
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home