diff options
| author | Andrew Morton <akpm@osdl.org> | 2006-03-28 02:42:49 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-03-28 04:48:54 -0500 |
| commit | 872345b715ee02f3b45528449f0d11b44ef9ebb8 (patch) | |
| tree | f2baa4bb2c6461bc4dc1fb6f14d1f0ad93e7ccaa | |
| parent | 4d177fbfdadb011f1bac96f9ccba0cc9f21da8de (diff) | |
[PATCH] git-powerpc: WARN was a dumb idea
There are at least 14 different implementations of WARN() in the tree already.
The build fails all over the place.
Cc: Paul Mackerras <paulus@samba.org>
Cc: Michael Ellerman <michael@ellerman.id.au>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
| -rw-r--r-- | include/asm-powerpc/bug.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/asm-powerpc/bug.h b/include/asm-powerpc/bug.h index 8003997ddc73..f44b529e3298 100644 --- a/include/asm-powerpc/bug.h +++ b/include/asm-powerpc/bug.h | |||
| @@ -40,7 +40,7 @@ struct bug_entry *find_bug(unsigned long bugaddr); | |||
| 40 | __asm__ __volatile__( \ | 40 | __asm__ __volatile__( \ |
| 41 | "1: twi 31,0,0\n" \ | 41 | "1: twi 31,0,0\n" \ |
| 42 | ".section __bug_table,\"a\"\n" \ | 42 | ".section __bug_table,\"a\"\n" \ |
| 43 | "\t"PPC_LONG" 1b,%0,%1,%2\n" \ | 43 | "\t"PPC_LONG" 1b,%0,%1,%2\n" \ |
| 44 | ".previous" \ | 44 | ".previous" \ |
| 45 | : : "i" (__LINE__), "i" (__FILE__), "i" (__FUNCTION__)); \ | 45 | : : "i" (__LINE__), "i" (__FILE__), "i" (__FUNCTION__)); \ |
| 46 | } while (0) | 46 | } while (0) |
| @@ -53,14 +53,14 @@ struct bug_entry *find_bug(unsigned long bugaddr); | |||
| 53 | __asm__ __volatile__( \ | 53 | __asm__ __volatile__( \ |
| 54 | "1: "PPC_TLNEI" %0,0\n" \ | 54 | "1: "PPC_TLNEI" %0,0\n" \ |
| 55 | ".section __bug_table,\"a\"\n" \ | 55 | ".section __bug_table,\"a\"\n" \ |
| 56 | "\t"PPC_LONG" 1b,%1,%2,%3\n" \ | 56 | "\t"PPC_LONG" 1b,%1,%2,%3\n" \ |
| 57 | ".previous" \ | 57 | ".previous" \ |
| 58 | : : "r" ((long)(x)), "i" (__LINE__), \ | 58 | : : "r" ((long)(x)), "i" (__LINE__), \ |
| 59 | "i" (__FILE__), "i" (__FUNCTION__)); \ | 59 | "i" (__FILE__), "i" (__FUNCTION__)); \ |
| 60 | } \ | 60 | } \ |
| 61 | } while (0) | 61 | } while (0) |
| 62 | 62 | ||
| 63 | #define WARN() do { \ | 63 | #define __WARN() do { \ |
| 64 | __asm__ __volatile__( \ | 64 | __asm__ __volatile__( \ |
| 65 | "1: twi 31,0,0\n" \ | 65 | "1: twi 31,0,0\n" \ |
| 66 | ".section __bug_table,\"a\"\n" \ | 66 | ".section __bug_table,\"a\"\n" \ |
| @@ -73,12 +73,12 @@ struct bug_entry *find_bug(unsigned long bugaddr); | |||
| 73 | #define WARN_ON(x) do { \ | 73 | #define WARN_ON(x) do { \ |
| 74 | if (__builtin_constant_p(x)) { \ | 74 | if (__builtin_constant_p(x)) { \ |
| 75 | if (x) \ | 75 | if (x) \ |
| 76 | WARN(); \ | 76 | __WARN(); \ |
| 77 | } else { \ | 77 | } else { \ |
| 78 | __asm__ __volatile__( \ | 78 | __asm__ __volatile__( \ |
| 79 | "1: "PPC_TLNEI" %0,0\n" \ | 79 | "1: "PPC_TLNEI" %0,0\n" \ |
| 80 | ".section __bug_table,\"a\"\n" \ | 80 | ".section __bug_table,\"a\"\n" \ |
| 81 | "\t"PPC_LONG" 1b,%1,%2,%3\n" \ | 81 | "\t"PPC_LONG" 1b,%1,%2,%3\n" \ |
| 82 | ".previous" \ | 82 | ".previous" \ |
| 83 | : : "r" ((long)(x)), \ | 83 | : : "r" ((long)(x)), \ |
| 84 | "i" (__LINE__ + BUG_WARNING_TRAP), \ | 84 | "i" (__LINE__ + BUG_WARNING_TRAP), \ |