Commit d3297a64 authored by David Howells's avatar David Howells Committed by Linus Torvalds

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: default avatarDavid Howells <dhowells@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent d1a5d197
...@@ -87,7 +87,7 @@ do { \ ...@@ -87,7 +87,7 @@ do { \
} while(0) } while(0)
#define irqs_disabled() \ #define irqs_disabled() \
({unsigned long flags; local_save_flags(flags); flags; }) ({unsigned long flags; local_save_flags(flags); !!flags; })
#define local_irq_save(flags) \ #define local_irq_save(flags) \
do { \ do { \
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment