diff --git a/[refs] b/[refs]
index 9138e6c972c2..f70d19938d15 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d1a5d1979702cc57b9b80f636426ec7ad1655cad
+refs/heads/master: d3297a644a0ab784e0c810ceca6bf35a67868ad9
diff --git a/trunk/include/asm-frv/system.h b/trunk/include/asm-frv/system.h
index d3a12a9079f7..7742ec000cc4 100644
--- a/trunk/include/asm-frv/system.h
+++ b/trunk/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 {						\