aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Howells <dhowells@redhat.com>2008-07-12 13:47:58 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-07-12 14:33:42 -0700
commitd3297a644a0ab784e0c810ceca6bf35a67868ad9 (patch)
treeec6c77178bde80b95bd654b47ac3b615135772ed
parentd1a5d1979702cc57b9b80f636426ec7ad1655cad (diff)
downloadlinux-stericsson-d3297a644a0ab784e0c810ceca6bf35a67868ad9.tar.gz
frv: fix irqs_disabled() to return an int, not an unsigned long
Fix FRV irqs_disabled() to return an int, not an unsigned long to avoid this warning: kernel/sched.c: In function '__might_sleep': kernel/sched.c:8198: warning: format '%d' expects type 'int', but argument 3 has type 'long unsigned int' Signed-off-by: David Howells <dhowells@redhat.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--include/asm-frv/system.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-frv/system.h b/include/asm-frv/system.h
index d3a12a9079f7..7742ec000cc4 100644
--- a/include/asm-frv/system.h
+++ b/include/asm-frv/system.h
@@ -87,7 +87,7 @@ do { \
} while(0)
#define irqs_disabled() \
- ({unsigned long flags; local_save_flags(flags); flags; })
+ ({unsigned long flags; local_save_flags(flags); !!flags; })
#define local_irq_save(flags) \
do { \