This is a set of changes to use the generic bug report infrastructure from <asm-generic/bug.h>, removing duplicate code that's provided now. Signed-off-by: Maciej W. Rozycki <macro@linux-mips.org> --- Please apply. Maciej patch-mips-2.6.18-20060920-vax-bug-0 diff -up --recursive --new-file linux-mips-2.6.18-20060920.macro/include/asm-vax/bug.h linux-mips-2.6.18-20060920/include/asm-vax/bug.h --- linux-mips-2.6.18-20060920.macro/include/asm-vax/bug.h 2007-01-11 00:00:00.000000000 +0000 +++ linux-mips-2.6.18-20060920/include/asm-vax/bug.h 2007-01-28 05:42:42.000000000 +0000 @@ -1,22 +1,13 @@ #ifndef _ASMVAX_BUG_H #define _ASMVAX_BUG_H +#ifdef CONFIG_BUG +#define HAVE_ARCH_BUG #define BUG() do { \ - printk("kernel BUG at %s:%d!\n", __FILE__, __LINE__); \ + printk("BUG: failure at %s:%d/%s()!\n", __FILE__, __LINE__, __FUNCTION__); \ __asm__ __volatile__("bugw $0"); \ } while (0) +#endif -#define BUG_ON(condition) do { if (unlikely((condition)!=0)) BUG(); } while(0) - -#define WARN_ON(condition) do { \ - if (unlikely((condition)!=0)) { \ - printk("Badness in %s at %s:%d\n", __FUNCTION__, __FILE__, __LINE__); \ - dump_stack(); \ - } \ -} while (0) - -#define PAGE_BUG(page) do { \ - BUG(); \ -} while (0) - +#include <asm-generic/bug.h> #endif /* _ASMVAX_BUG_H */ _______________________________________________ Linux-Vax mailing list Linux-Vax@pergamentum.com http://www.pergamentum.com/mailman/listinfo/linux-vax