diff options
Diffstat (limited to 'arch/m68k/include/asm/bug.h')
| -rw-r--r-- | arch/m68k/include/asm/bug.h | 31 | 
1 files changed, 28 insertions, 3 deletions
diff --git a/arch/m68k/include/asm/bug.h b/arch/m68k/include/asm/bug.h index 997e0944ebc..ef9a2e47352 100644 --- a/arch/m68k/include/asm/bug.h +++ b/arch/m68k/include/asm/bug.h @@ -1,5 +1,30 @@ -#ifdef __uClinux__ -#include "bug_no.h" +#ifndef _M68K_BUG_H +#define _M68K_BUG_H + +#ifdef CONFIG_MMU +#ifdef CONFIG_BUG +#ifdef CONFIG_DEBUG_BUGVERBOSE +#ifndef CONFIG_SUN3 +#define BUG() do { \ +	printk("kernel BUG at %s:%d!\n", __FILE__, __LINE__); \ +	__builtin_trap(); \ +} while (0)  #else -#include "bug_mm.h" +#define BUG() do { \ +	printk("kernel BUG at %s:%d!\n", __FILE__, __LINE__); \ +	panic("BUG!"); \ +} while (0) +#endif +#else +#define BUG() do { \ +	__builtin_trap(); \ +} while (0) +#endif + +#define HAVE_ARCH_BUG +#endif +#endif /* CONFIG_MMU */ + +#include <asm-generic/bug.h> +  #endif  |