[PATCH] arm: irqs_disabled() type fix

kernel/sched.c: In function `__might_sleep':
kernel/sched.c:5461: warning: int format, long unsigned int arg (arg 3)

We expect irqs_disabled() to return an int (poor man's bool).

Acked-by: Russell King <rmk@arm.linux.org.uk>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/include/asm-arm/system.h b/include/asm-arm/system.h
index 8405eb6558edf141999df5ace0c3ba4bf7070ce4..39dd7008013c839a102bc49f53ba4ba5691ab864 100644 (file)
--- a/include/asm-arm/system.h
+++ b/include/asm-arm/system.h
@@ -308,7 +308,7 @@ do {                                                                        \
 ({                                     \
        unsigned long flags;            \
        local_save_flags(flags);        \
-       flags & PSR_I_BIT;              \
+       (int)(flags & PSR_I_BIT);       \
 })
 
 #ifdef CONFIG_SMP