From: Andrew Morton <akpm@osdl.org>
Date: Wed, 22 Jun 2005 00:14:28 +0000 (-0700)
Subject: [PATCH] arm: irqs_disabled() type fix
X-Git-Tag: v2.6.13-rc1~68^2~582^2~167
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9a558cb4ec43ccbe82e2cf899ced37f29ac017df;p=linux-2.6

[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 8405eb6558..39dd700801 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