ia64/xen-unstable

changeset 12280:0c332cf81e64

[XEN] Remove unnecessary FORCE_CRASH() macro.
Signed-off-by: Keir Fraser <keir@xensource.com>
author kfraser@localhost.localdomain
date Tue Nov 07 10:41:35 2006 +0000 (2006-11-07)
parents cb8eeadd8eae
children 9febecbeaeb0
files xen/drivers/char/console.c xen/include/asm-ia64/config.h xen/include/asm-ia64/debugger.h xen/include/asm-powerpc/powerpc64/config.h xen/include/asm-x86/config.h
line diff
     1.1 --- a/xen/drivers/char/console.c	Tue Nov 07 10:37:30 2006 +0000
     1.2 +++ b/xen/drivers/char/console.c	Tue Nov 07 10:41:35 2006 +0000
     1.3 @@ -880,9 +880,9 @@ void panic(const char *fmt, ...)
     1.4  void __bug(char *file, int line)
     1.5  {
     1.6      console_start_sync();
     1.7 -    debugtrace_dump();
     1.8      printk("BUG at %s:%d\n", file, line);
     1.9 -    FORCE_CRASH();
    1.10 +    dump_execution_state();
    1.11 +    panic("BUG at %s:%d\n", file, line);
    1.12      for ( ; ; ) ;
    1.13  }
    1.14  
     2.1 --- a/xen/include/asm-ia64/config.h	Tue Nov 07 10:37:30 2006 +0000
     2.2 +++ b/xen/include/asm-ia64/config.h	Tue Nov 07 10:41:35 2006 +0000
     2.3 @@ -271,13 +271,6 @@ struct screen_info { };
     2.4  #endif /* __ASSEMBLY__ */
     2.5  #endif /* __XEN_IA64_CONFIG_H__ */
     2.6  
     2.7 -#ifndef __ASSEMBLY__
     2.8 -#include <linux/linkage.h>
     2.9 -#define FORCE_CRASH()	asm("break.m 0;;");
    2.10 -#else
    2.11 -#define FORCE_CRASH	break.m 0;;
    2.12 -#endif
    2.13 -
    2.14  /* Allow .serialize.data/instruction in asm files.
    2.15     Old as doesn't handle this.  */
    2.16  #define HAVE_SERIALIZE_DIRECTIVE
     3.1 --- a/xen/include/asm-ia64/debugger.h	Tue Nov 07 10:37:30 2006 +0000
     3.2 +++ b/xen/include/asm-ia64/debugger.h	Tue Nov 07 10:41:35 2006 +0000
     3.3 @@ -23,7 +23,6 @@
     3.4  #define __ASM_DEBUGGER_H__
     3.5  
     3.6  // this number is an arbitary number which is not used for any other purpose
     3.7 -// __builtin_trap(), FORCE_CRASH() 0x0
     3.8  // ski  0x80001, 0x80002
     3.9  // kdb  0x80100, 0x80101
    3.10  // kprobe 0x80200, jprobe 0x80300
     4.1 --- a/xen/include/asm-powerpc/powerpc64/config.h	Tue Nov 07 10:37:30 2006 +0000
     4.2 +++ b/xen/include/asm-powerpc/powerpc64/config.h	Tue Nov 07 10:41:35 2006 +0000
     4.3 @@ -36,10 +36,4 @@
     4.4  #define HAS_FLOAT 1
     4.5  #define HAS_VMX 1
     4.6  
     4.7 -#ifndef __ASSEMBLY__
     4.8 -
     4.9 -#define FORCE_CRASH() __asm__ __volatile__ ( "trap" )
    4.10 -
    4.11 -#endif /* __ASSEMBLY__ */
    4.12 -
    4.13  #endif
     5.1 --- a/xen/include/asm-x86/config.h	Tue Nov 07 10:37:30 2006 +0000
     5.2 +++ b/xen/include/asm-x86/config.h	Tue Nov 07 10:41:35 2006 +0000
     5.3 @@ -86,13 +86,6 @@
     5.4  
     5.5  #ifndef __ASSEMBLY__
     5.6  extern unsigned long _end; /* standard ELF symbol */
     5.7 -
     5.8 -static inline void FORCE_CRASH(void) __attribute__((noreturn,always_inline)); 
     5.9 -static inline void FORCE_CRASH(void) 
    5.10 -{
    5.11 -    __asm__ __volatile__ ( "ud2" );
    5.12 -    while(1);
    5.13 -}
    5.14  #endif /* __ASSEMBLY__ */
    5.15  
    5.16  #if defined(__x86_64__)