aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-powerpc/bug.h
diff options
context:
space:
mode:
authorAl Viro <viro@ftp.linux.org.uk>2005-11-01 22:10:43 -0500
committerPaul Mackerras <paulus@samba.org>2005-11-01 23:01:30 -0500
commitf2cad7a8cdbe66d313059824d61ef1f455031566 (patch)
tree2eeadc87ded22e3581ebcc418e83107911f21a06 /include/asm-powerpc/bug.h
parent2ff2ae7a0d7bfd813325663dc6353d034db7473d (diff)
[PATCH] ppc bug.h namespace pollution
DATA_TYPE is really not a good thing to put into header that gets included all over the tree... Just make the cast always (long) and get rid of DATA_TYPE altogether. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'include/asm-powerpc/bug.h')
-rw-r--r--include/asm-powerpc/bug.h6
1 files changed, 2 insertions, 4 deletions
diff --git a/include/asm-powerpc/bug.h b/include/asm-powerpc/bug.h
index 943e3d7dbcc7..f49f46271ba6 100644
--- a/include/asm-powerpc/bug.h
+++ b/include/asm-powerpc/bug.h
@@ -15,12 +15,10 @@
15#define BUG_TABLE_ENTRY(label, line, file, func) \ 15#define BUG_TABLE_ENTRY(label, line, file, func) \
16 ".llong " #label ", " #line ", " #file ", " #func "\n" 16 ".llong " #label ", " #line ", " #file ", " #func "\n"
17#define TRAP_OP(ra, rb) "1: tdnei " #ra ", " #rb "\n" 17#define TRAP_OP(ra, rb) "1: tdnei " #ra ", " #rb "\n"
18#define DATA_TYPE long long
19#else 18#else
20#define BUG_TABLE_ENTRY(label, line, file, func) \ 19#define BUG_TABLE_ENTRY(label, line, file, func) \
21 ".long " #label ", " #line ", " #file ", " #func "\n" 20 ".long " #label ", " #line ", " #file ", " #func "\n"
22#define TRAP_OP(ra, rb) "1: twnei " #ra ", " #rb "\n" 21#define TRAP_OP(ra, rb) "1: twnei " #ra ", " #rb "\n"
23#define DATA_TYPE int
24#endif /* __powerpc64__ */ 22#endif /* __powerpc64__ */
25 23
26struct bug_entry { 24struct bug_entry {
@@ -55,7 +53,7 @@ struct bug_entry *find_bug(unsigned long bugaddr);
55 ".section __bug_table,\"a\"\n\t" \ 53 ".section __bug_table,\"a\"\n\t" \
56 BUG_TABLE_ENTRY(1b,%1,%2,%3) \ 54 BUG_TABLE_ENTRY(1b,%1,%2,%3) \
57 ".previous" \ 55 ".previous" \
58 : : "r" ((DATA_TYPE)(x)), "i" (__LINE__), \ 56 : : "r" ((long)(x)), "i" (__LINE__), \
59 "i" (__FILE__), "i" (__FUNCTION__)); \ 57 "i" (__FILE__), "i" (__FUNCTION__)); \
60} while (0) 58} while (0)
61 59
@@ -65,7 +63,7 @@ struct bug_entry *find_bug(unsigned long bugaddr);
65 ".section __bug_table,\"a\"\n\t" \ 63 ".section __bug_table,\"a\"\n\t" \
66 BUG_TABLE_ENTRY(1b,%1,%2,%3) \ 64 BUG_TABLE_ENTRY(1b,%1,%2,%3) \
67 ".previous" \ 65 ".previous" \
68 : : "r" ((DATA_TYPE)(x)), \ 66 : : "r" ((long)(x)), \
69 "i" (__LINE__ + BUG_WARNING_TRAP), \ 67 "i" (__LINE__ + BUG_WARNING_TRAP), \
70 "i" (__FILE__), "i" (__FUNCTION__)); \ 68 "i" (__FILE__), "i" (__FUNCTION__)); \
71} while (0) 69} while (0)