diff options
| author | David S. Miller <davem@sunset.davemloft.net> | 2007-11-16 02:53:50 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-02-09 04:00:32 -0800 |
| commit | e10195c232d426b5e960038e10b0df8f75d86309 (patch) | |
| tree | 7bcefd2ba59a597e6931f592a8068febd8bacf10 /include/asm-sparc64/bug.h | |
| parent | c79ca3f841aeb31aeadd6348f132780b6f658c22 (diff) | |
| download | kernel_samsung_aries-e10195c232d426b5e960038e10b0df8f75d86309.zip kernel_samsung_aries-e10195c232d426b5e960038e10b0df8f75d86309.tar.gz kernel_samsung_aries-e10195c232d426b5e960038e10b0df8f75d86309.tar.bz2 | |
[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 <davem@davemloft.net>
Diffstat (limited to 'include/asm-sparc64/bug.h')
| -rw-r--r-- | include/asm-sparc64/bug.h | 23 |
1 files changed, 1 insertions, 22 deletions
diff --git a/include/asm-sparc64/bug.h b/include/asm-sparc64/bug.h index 516bb27..3433737 100644 --- a/include/asm-sparc64/bug.h +++ b/include/asm-sparc64/bug.h @@ -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> |