diff options
author | Heiko Carstens <heiko.carstens@de.ibm.com> | 2007-08-01 18:18:38 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-01 23:45:38 -0400 |
commit | fd0cbdd378258fdf44eac5ea091256a4a665315b (patch) | |
tree | d45c9d74c159034db371919864b400a6f3ca0dbf | |
parent | 8d4fbcfbe0a4bfc73e7f0297c59ae514e1f1436f (diff) |
Fix WARN_ON() on bitfield ops for all other archs
Fixes WARN_ON() on bitfiels ops for all architectures that have
been left out in 8d4fbcfbe0a4bfc73e7f0297c59ae514e1f1436f.
Cc: Alexey Dobriyan <adobriyan@sw.ru>
Cc: Herbert Xu <herbert@gondor.apana.org.au>
Cc: Haavard Skinnemoen <hskinnemoen@atmel.com>
Cc: Matthew Wilcox <matthew@wil.cx>
Cc: Kyle McMartin <kyle@parisc-linux.org>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Acked-by: Paul Mundt <lethal@linux-sh.org>
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | include/asm-avr32/bug.h | 2 | ||||
-rw-r--r-- | include/asm-parisc/bug.h | 2 | ||||
-rw-r--r-- | include/asm-s390/bug.h | 2 | ||||
-rw-r--r-- | include/asm-sh/bug.h | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/include/asm-avr32/bug.h b/include/asm-avr32/bug.h index afdcd79a2966..331d45bab18f 100644 --- a/include/asm-avr32/bug.h +++ b/include/asm-avr32/bug.h | |||
@@ -57,7 +57,7 @@ | |||
57 | 57 | ||
58 | #define WARN_ON(condition) \ | 58 | #define WARN_ON(condition) \ |
59 | ({ \ | 59 | ({ \ |
60 | typeof(condition) __ret_warn_on = (condition); \ | 60 | int __ret_warn_on = !!(condition); \ |
61 | if (unlikely(__ret_warn_on)) \ | 61 | if (unlikely(__ret_warn_on)) \ |
62 | _BUG_OR_WARN(BUGFLAG_WARNING); \ | 62 | _BUG_OR_WARN(BUGFLAG_WARNING); \ |
63 | unlikely(__ret_warn_on); \ | 63 | unlikely(__ret_warn_on); \ |
diff --git a/include/asm-parisc/bug.h b/include/asm-parisc/bug.h index 83ba510ed5d8..8cfc553fc837 100644 --- a/include/asm-parisc/bug.h +++ b/include/asm-parisc/bug.h | |||
@@ -74,7 +74,7 @@ | |||
74 | 74 | ||
75 | 75 | ||
76 | #define WARN_ON(x) ({ \ | 76 | #define WARN_ON(x) ({ \ |
77 | typeof(x) __ret_warn_on = (x); \ | 77 | int __ret_warn_on = !!(x); \ |
78 | if (__builtin_constant_p(__ret_warn_on)) { \ | 78 | if (__builtin_constant_p(__ret_warn_on)) { \ |
79 | if (__ret_warn_on) \ | 79 | if (__ret_warn_on) \ |
80 | __WARN(); \ | 80 | __WARN(); \ |
diff --git a/include/asm-s390/bug.h b/include/asm-s390/bug.h index 838684dc6d35..384e3621e341 100644 --- a/include/asm-s390/bug.h +++ b/include/asm-s390/bug.h | |||
@@ -50,7 +50,7 @@ | |||
50 | #define BUG() __EMIT_BUG(0) | 50 | #define BUG() __EMIT_BUG(0) |
51 | 51 | ||
52 | #define WARN_ON(x) ({ \ | 52 | #define WARN_ON(x) ({ \ |
53 | typeof(x) __ret_warn_on = (x); \ | 53 | int __ret_warn_on = !!(x); \ |
54 | if (__builtin_constant_p(__ret_warn_on)) { \ | 54 | if (__builtin_constant_p(__ret_warn_on)) { \ |
55 | if (__ret_warn_on) \ | 55 | if (__ret_warn_on) \ |
56 | __EMIT_BUG(BUGFLAG_WARNING); \ | 56 | __EMIT_BUG(BUGFLAG_WARNING); \ |
diff --git a/include/asm-sh/bug.h b/include/asm-sh/bug.h index 46f925c815ac..a78d482e8b2f 100644 --- a/include/asm-sh/bug.h +++ b/include/asm-sh/bug.h | |||
@@ -61,7 +61,7 @@ do { \ | |||
61 | } while (0) | 61 | } while (0) |
62 | 62 | ||
63 | #define WARN_ON(x) ({ \ | 63 | #define WARN_ON(x) ({ \ |
64 | typeof(x) __ret_warn_on = (x); \ | 64 | int __ret_warn_on = !!(x); \ |
65 | if (__builtin_constant_p(__ret_warn_on)) { \ | 65 | if (__builtin_constant_p(__ret_warn_on)) { \ |
66 | if (__ret_warn_on) \ | 66 | if (__ret_warn_on) \ |
67 | __WARN(); \ | 67 | __WARN(); \ |