projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/home/rmk/linux-2.6-arm
[powerpc.git]
/
include
/
asm-powerpc
/
bug.h
diff --git
a/include/asm-powerpc/bug.h
b/include/asm-powerpc/bug.h
index
f6fa394
..
e55d1f6
100644
(file)
--- 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)), \
_EMIT_BUG_ENTRY \
: : "i" (__FILE__), "i" (__LINE__), "i" (0), \
"i" (sizeof(struct bug_entry)), \
- "r" ((
long)(x)));
\
+ "r" ((
__force long)(x)));
\
} \
} while (0)
} \
} while (0)
@@
-93,7
+93,7
@@
} while (0)
#define WARN_ON(x) ({ \
} 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(); \
if (__builtin_constant_p(__ret_warn_on)) { \
if (__ret_warn_on) \
__WARN(); \