diff --git a/[refs] b/[refs]
index af2794ceb5cb..bd0910c568fa 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a31baca58cc16fe0584685f54c6d17494a231c92
+refs/heads/master: 8c7c7c9bf39470c9689ad43cae3142cf948f4cfb
diff --git a/trunk/include/asm-generic/bug.h b/trunk/include/asm-generic/bug.h
index 1d9573cf4a0b..c92ae0f166ff 100644
--- a/trunk/include/asm-generic/bug.h
+++ b/trunk/include/asm-generic/bug.h
@@ -37,7 +37,10 @@
 #endif
 
 #ifndef HAVE_ARCH_WARN_ON
-#define WARN_ON(condition) unlikely((condition))
+#define WARN_ON(condition) ({						\
+	typeof(condition) __ret_warn_on = (condition);			\
+	unlikely(__ret_warn_on);					\
+})
 #endif
 #endif