diff --git a/[refs] b/[refs]
index d321f11127d5..37ff511f542d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8ce116e5993cf64729a4d2b3dc2c0f072852654b
+refs/heads/master: a7d5ac87b220829bb077cdc8e01c4fd4714ae41e
diff --git a/trunk/include/linux/irqflags.h b/trunk/include/linux/irqflags.h
index 412e025bc5c7..e600c4e9b8c5 100644
--- a/trunk/include/linux/irqflags.h
+++ b/trunk/include/linux/irqflags.h
@@ -84,10 +84,10 @@
 
 #define irqs_disabled()						\
 ({								\
-	unsigned long flags;					\
+	unsigned long _flags;					\
 								\
-	raw_local_save_flags(flags);				\
-	raw_irqs_disabled_flags(flags);				\
+	raw_local_save_flags(_flags);				\
+	raw_irqs_disabled_flags(_flags);			\
 })
 
 #define irqs_disabled_flags(flags)	raw_irqs_disabled_flags(flags)