Commit e10195c2 authored by David S. Miller's avatar David S. Miller Committed by David S. Miller

[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: default avatarDavid S. Miller <davem@davemloft.net>
parent c79ca3f8
...@@ -2,28 +2,16 @@ ...@@ -2,28 +2,16 @@
#define _SPARC_BUG_H #define _SPARC_BUG_H
#ifdef CONFIG_BUG #ifdef CONFIG_BUG
/* Only use the inline asm until a gcc release that can handle __builtin_trap #include <linux/compiler.h>
* -rob 2003-06-25
*
* gcc-3.3.1 and later will be OK -DaveM
*/
#if (__GNUC__ > 3) || \
(__GNUC__ == 3 && __GNUC_MINOR__ > 3) || \
(__GNUC__ == 3 && __GNUC_MINOR__ == 3 && __GNUC_PATCHLEVEL__ >= 4)
#define __bug_trap() __builtin_trap()
#else
#define __bug_trap() \
__asm__ __volatile__ ("t 0x5\n\t" : : )
#endif
#ifdef CONFIG_DEBUG_BUGVERBOSE #ifdef CONFIG_DEBUG_BUGVERBOSE
extern void do_BUG(const char *file, int line); extern void do_BUG(const char *file, int line);
#define BUG() do { \ #define BUG() do { \
do_BUG(__FILE__, __LINE__); \ do_BUG(__FILE__, __LINE__); \
__bug_trap(); \ __builtin_trap(); \
} while (0) } while (0)
#else #else
#define BUG() __bug_trap() #define BUG() __builtin_trap()
#endif #endif
#define HAVE_ARCH_BUG #define HAVE_ARCH_BUG
......
#ifndef _SPARC64_BUG_H #include <asm-sparc/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
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment