summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAl Viro2007-07-26 18:35:49 +0200
committerLinus Torvalds2007-07-26 20:11:57 +0200
commit97f1e7f7d2cd950f90d64ac6920822e709095519 (patch)
tree4bd8bfc2b40288d0f1ee50de8549e209cccef58b
parentamd64: fix get_user() on bitwise (diff)
downloadkernel-qcow2-linux-97f1e7f7d2cd950f90d64ac6920822e709095519.tar.gz
kernel-qcow2-linux-97f1e7f7d2cd950f90d64ac6920822e709095519.tar.xz
kernel-qcow2-linux-97f1e7f7d2cd950f90d64ac6920822e709095519.zip
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>
-rw-r--r--include/asm-powerpc/bug.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-powerpc/bug.h b/include/asm-powerpc/bug.h
index f6fa39474846..a248b8bd4d7c 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)