Merge branch 'linus' into xen-64bit

[cascardo/linux.git] / include / asm-s390 / bug.h

diff --git a/include/asm-s390/bug.h b/include/asm-s390/bug.h
index 838684d..384e362 100644 (file)
--- 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);    \