summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Morton <akpm@osdl.org>2005-06-21 17:14:28 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-21 18:46:11 -0700
commit9a558cb4ec43ccbe82e2cf899ced37f29ac017df (patch)
tree360f64dcf8ecdb04371a2fd524fddb2424392564
parent9723d95d1076e9ef394ff26162fb0b47531089b0 (diff)
[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>
-rw-r--r--include/asm-arm/system.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-arm/system.h b/include/asm-arm/system.h
index 8405eb6558ed..39dd7008013c 100644
--- 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