From 6c3040dee708fe7198f778ec44797b4af52c62e8 Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Tue, 31 Jul 2007 21:12:07 -0700
Subject: [PATCH] --- yaml --- r: 63529 b: refs/heads/master c:
 8d4fbcfbe0a4bfc73e7f0297c59ae514e1f1436f h: refs/heads/master i:   63527:
 f61054f417e37649860f11f3baa0cf0291c64038 v: v3

---
 [refs]                          | 2 +-
 trunk/include/asm-generic/bug.h | 6 +++---
 trunk/include/asm-powerpc/bug.h | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index ee13906a0250..e5db93f21a64 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2f63251ed0a803ddbe7bf2577b69d467aa872f68
+refs/heads/master: 8d4fbcfbe0a4bfc73e7f0297c59ae514e1f1436f
diff --git a/trunk/include/asm-generic/bug.h b/trunk/include/asm-generic/bug.h
index 344e3091af24..d56fedbb457a 100644
--- a/trunk/include/asm-generic/bug.h
+++ b/trunk/include/asm-generic/bug.h
@@ -33,7 +33,7 @@ struct bug_entry {
 
 #ifndef HAVE_ARCH_WARN_ON
 #define WARN_ON(condition) ({						\
-	typeof(condition) __ret_warn_on = (condition);			\
+	int __ret_warn_on = !!(condition);				\
 	if (unlikely(__ret_warn_on)) {					\
 		printk("WARNING: at %s:%d %s()\n", __FILE__,		\
 			__LINE__, __FUNCTION__);			\
@@ -54,7 +54,7 @@ struct bug_entry {
 
 #ifndef HAVE_ARCH_WARN_ON
 #define WARN_ON(condition) ({						\
-	typeof(condition) __ret_warn_on = (condition);			\
+	int __ret_warn_on = !!(condition);				\
 	unlikely(__ret_warn_on);					\
 })
 #endif
@@ -62,7 +62,7 @@ struct bug_entry {
 
 #define WARN_ON_ONCE(condition)	({				\
 	static int __warned;					\
-	typeof(condition) __ret_warn_once = (condition);	\
+	int __ret_warn_once = !!(condition);			\
 								\
 	if (unlikely(__ret_warn_once))				\
 		if (WARN_ON(!__warned)) 			\
diff --git a/trunk/include/asm-powerpc/bug.h b/trunk/include/asm-powerpc/bug.h
index a248b8bd4d7c..e55d1f66b86f 100644
--- a/trunk/include/asm-powerpc/bug.h
+++ b/trunk/include/asm-powerpc/bug.h
@@ -93,7 +93,7 @@
 } 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();				\