summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHeiko Carstens <heiko.carstens@de.ibm.com>2007-08-02 00:18:38 +0200
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-08-01 20:45:38 -0700
commitfd0cbdd378258fdf44eac5ea091256a4a665315b (patch)
treed45c9d74c159034db371919864b400a6f3ca0dbf
parent8d4fbcfbe0a4bfc73e7f0297c59ae514e1f1436f (diff)
downloadop-kernel-dev-fd0cbdd378258fdf44eac5ea091256a4a665315b.zip
op-kernel-dev-fd0cbdd378258fdf44eac5ea091256a4a665315b.tar.gz
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.h2
-rw-r--r--include/asm-parisc/bug.h2
-rw-r--r--include/asm-s390/bug.h2
-rw-r--r--include/asm-sh/bug.h2
4 files changed, 4 insertions, 4 deletions
diff --git a/include/asm-avr32/bug.h b/include/asm-avr32/bug.h
index afdcd79..331d45b 100644
--- a/include/asm-avr32/bug.h
+++ b/include/asm-avr32/bug.h
@@ -57,7 +57,7 @@
#define WARN_ON(condition) \
({ \
- typeof(condition) __ret_warn_on = (condition); \
+ int __ret_warn_on = !!(condition); \
if (unlikely(__ret_warn_on)) \
_BUG_OR_WARN(BUGFLAG_WARNING); \
unlikely(__ret_warn_on); \
diff --git a/include/asm-parisc/bug.h b/include/asm-parisc/bug.h
index 83ba510..8cfc553 100644
--- a/include/asm-parisc/bug.h
+++ b/include/asm-parisc/bug.h
@@ -74,7 +74,7 @@
#define WARN_ON(x) ({ \
- typeof(x) __ret_warn_on = (x); \
+ int __ret_warn_on = !!(x); \
if (__builtin_constant_p(__ret_warn_on)) { \
if (__ret_warn_on) \
__WARN(); \
diff --git a/include/asm-s390/bug.h b/include/asm-s390/bug.h
index 838684d..384e362 100644
--- a/include/asm-s390/bug.h
+++ b/include/asm-s390/bug.h
@@ -50,7 +50,7 @@
#define BUG() __EMIT_BUG(0)
#define WARN_ON(x) ({ \
- typeof(x) __ret_warn_on = (x); \
+ int __ret_warn_on = !!(x); \
if (__builtin_constant_p(__ret_warn_on)) { \
if (__ret_warn_on) \
__EMIT_BUG(BUGFLAG_WARNING); \
diff --git a/include/asm-sh/bug.h b/include/asm-sh/bug.h
index 46f925c..a78d482 100644
--- a/include/asm-sh/bug.h
+++ b/include/asm-sh/bug.h
@@ -61,7 +61,7 @@ do { \
} while (0)
#define WARN_ON(x) ({ \
- typeof(x) __ret_warn_on = (x); \
+ int __ret_warn_on = !!(x); \
if (__builtin_constant_p(__ret_warn_on)) { \
if (__ret_warn_on) \
__WARN(); \
OpenPOWER on IntegriCloud