Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
[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>
authored by David S. Miller and committed by David S. Miller e10195c2 c79ca3f8
+3
-15
include/asm-sparc/bug.h
+3
-15
include/asm-sparc/bug.h
···
2
2
#define _SPARC_BUG_H
3
3
4
4
#ifdef CONFIG_BUG
5
-
/* Only use the inline asm until a gcc release that can handle __builtin_trap
6
-
* -rob 2003-06-25
7
-
*
8
-
* gcc-3.3.1 and later will be OK -DaveM
9
-
*/
10
-
#if (__GNUC__ > 3) || \
11
-
(__GNUC__ == 3 && __GNUC_MINOR__ > 3) || \
12
-
(__GNUC__ == 3 && __GNUC_MINOR__ == 3 && __GNUC_PATCHLEVEL__ >= 4)
13
-
#define __bug_trap() __builtin_trap()
14
-
#else
15
-
#define __bug_trap() \
16
-
__asm__ __volatile__ ("t 0x5\n\t" : : )
17
-
#endif
5
+
#include <linux/compiler.h>
18
6
19
7
#ifdef CONFIG_DEBUG_BUGVERBOSE
20
8
extern void do_BUG(const char *file, int line);
21
9
#define BUG() do { \
22
10
do_BUG(__FILE__, __LINE__); \
23
-
__bug_trap(); \
11
+
__builtin_trap(); \
24
12
} while (0)
25
13
#else
26
-
#define BUG() __bug_trap()
14
+
#define BUG() __builtin_trap()
27
15
#endif
28
16
29
17
#define HAVE_ARCH_BUG
+1
-22
include/asm-sparc64/bug.h
+1
-22
include/asm-sparc64/bug.h
···
1
-
#ifndef _SPARC64_BUG_H
2
-
#define _SPARC64_BUG_H
3
-
4
-
#ifdef CONFIG_BUG
5
-
#include <linux/compiler.h>
6
-
7
-
#ifdef CONFIG_DEBUG_BUGVERBOSE
8
-
extern void do_BUG(const char *file, int line);
9
-
#define BUG() do { \
10
-
do_BUG(__FILE__, __LINE__); \
11
-
__builtin_trap(); \
12
-
} while (0)
13
-
#else
14
-
#define BUG() __builtin_trap()
15
-
#endif
16
-
17
-
#define HAVE_ARCH_BUG
18
-
#endif
19
-
20
-
#include <asm-generic/bug.h>
21
-
22
-
#endif
1
+
#include <asm-sparc/bug.h>