diff options
| author | Al Viro <viro@ftp.linux.org.uk> | 2005-11-02 03:10:43 +0000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-11-02 15:01:30 +1100 |
| commit | f2cad7a8cdbe66d313059824d61ef1f455031566 (patch) | |
| tree | 2eeadc87ded22e3581ebcc418e83107911f21a06 /include | |
| parent | 2ff2ae7a0d7bfd813325663dc6353d034db7473d (diff) | |
| download | op-kernel-dev-f2cad7a8cdbe66d313059824d61ef1f455031566.zip op-kernel-dev-f2cad7a8cdbe66d313059824d61ef1f455031566.tar.gz | |
[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')
| -rw-r--r-- | include/asm-powerpc/bug.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/include/asm-powerpc/bug.h b/include/asm-powerpc/bug.h index 943e3d7..f49f462 100644 --- a/include/asm-powerpc/bug.h +++ b/include/asm-powerpc/bug.h @@ -15,12 +15,10 @@ #define BUG_TABLE_ENTRY(label, line, file, func) \ ".llong " #label ", " #line ", " #file ", " #func "\n" #define TRAP_OP(ra, rb) "1: tdnei " #ra ", " #rb "\n" -#define DATA_TYPE long long #else #define BUG_TABLE_ENTRY(label, line, file, func) \ ".long " #label ", " #line ", " #file ", " #func "\n" #define TRAP_OP(ra, rb) "1: twnei " #ra ", " #rb "\n" -#define DATA_TYPE int #endif /* __powerpc64__ */ struct bug_entry { @@ -55,7 +53,7 @@ struct bug_entry *find_bug(unsigned long bugaddr); ".section __bug_table,\"a\"\n\t" \ BUG_TABLE_ENTRY(1b,%1,%2,%3) \ ".previous" \ - : : "r" ((DATA_TYPE)(x)), "i" (__LINE__), \ + : : "r" ((long)(x)), "i" (__LINE__), \ "i" (__FILE__), "i" (__FUNCTION__)); \ } while (0) @@ -65,7 +63,7 @@ struct bug_entry *find_bug(unsigned long bugaddr); ".section __bug_table,\"a\"\n\t" \ BUG_TABLE_ENTRY(1b,%1,%2,%3) \ ".previous" \ - : : "r" ((DATA_TYPE)(x)), \ + : : "r" ((long)(x)), \ "i" (__LINE__ + BUG_WARNING_TRAP), \ "i" (__FILE__), "i" (__FUNCTION__)); \ } while (0) |
