Merge commit 'v2.6.28-rc1' into sched/urgent

[linux.git] / include / asm-frv / system.h

diff --git a/include/asm-frv/system.h b/include/asm-frv/system.h
index d3a12a9079f78f672615c3b5a31ed1bb7921e37f..7742ec000cc474d018c6378705395ce9e0b43688 100644 (file)
--- 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 {                                           \