From: Al Viro <viro@ftp.linux.org.uk>
Date: Thu, 26 Jul 2007 16:35:49 +0000 (+0100)
Subject: make powerpc BUG_ON() OK with pointers and bitwise
X-Git-Tag: v2.6.23-rc2~239
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=97f1e7f7d2cd950f90d64ac6920822e709095519;p=linux-2.6-omap-h63xx.git

make powerpc BUG_ON() OK with pointers and bitwise

Since powerpc insists on printing the _value_ of condition
and on casting it to long...  At least let's make it a force-cast.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/include/asm-powerpc/bug.h b/include/asm-powerpc/bug.h
index f6fa3947484..a248b8bd4d7 100644
--- a/include/asm-powerpc/bug.h
+++ b/include/asm-powerpc/bug.h
@@ -79,7 +79,7 @@
 		_EMIT_BUG_ENTRY					\
 		: : "i" (__FILE__), "i" (__LINE__), "i" (0),	\
 		  "i" (sizeof(struct bug_entry)),		\
-		  "r" ((long)(x)));				\
+		  "r" ((__force long)(x)));			\
 	}							\
 } while (0)