[SPARC]: Merge asm-sparc{,64}/bug.h

Note that because of minimum compiler version enforcement in
linux/compiler.h these days the check for sparc32 buggy
__builtin_trap() can be safely removed.

Signed-off-by: David S. Miller <[email protected]>
This commit is contained in:
David S. Miller 2007-11-16 02:53:50 -08:00 • committed by David S. Miller
commit e10195c232
2 changed files with 4 additions and 37 deletions

View file

@ -1,22 +1 @@
#ifndef _SPARC64_BUG_H
#define _SPARC64_BUG_H
#ifdef CONFIG_BUG
#include <linux/compiler.h>
#ifdef CONFIG_DEBUG_BUGVERBOSE
extern void do_BUG(const char *file, int line);
#define BUG() do { \
do_BUG(__FILE__, __LINE__); \
__builtin_trap(); \
} while (0)
#else
#define BUG() __builtin_trap()
#endif
#define HAVE_ARCH_BUG
#endif
#include <asm-generic/bug.h>
#endif
#include <asm-sparc/bug.h>