1 files changed, 32 insertions, 5 deletions

diff --git a/include/linux/irqflags.h b/include/linux/irqflags.h
index 412e025bc5c7..4fe740bf4eae 100644
--- a/include/linux/irqflags.h
+++ b/include/linux/irqflags.h
@@ -11,6 +11,12 @@
 #ifndef _LINUX_TRACE_IRQFLAGS_H
 #define _LINUX_TRACE_IRQFLAGS_H
 
+#define BUILD_CHECK_IRQ_FLAGS(flags)                                    \
+        do {                                                            \
+                BUILD_BUG_ON(sizeof(flags) != sizeof(unsigned long));   \
+                typecheck(unsigned long, flags);                        \
+        } while (0)
+
 #ifdef CONFIG_TRACE_IRQFLAGS
   extern void trace_hardirqs_on(void);
   extern void trace_hardirqs_off(void);
@@ -50,10 +56,15 @@
 #define local_irq_disable() \
         do { raw_local_irq_disable(); trace_hardirqs_off(); } while (0)
 #define local_irq_save(flags) \
-        do { raw_local_irq_save(flags); trace_hardirqs_off(); } while (0)
+        do {                                    \
+                BUILD_CHECK_IRQ_FLAGS(flags);   \
+                raw_local_irq_save(flags);      \
+                trace_hardirqs_off();           \
+        } while (0)
 
 #define local_irq_restore(flags)                                \
         do {                                                    \
+                BUILD_CHECK_IRQ_FLAGS(flags);                   \
                 if (raw_irqs_disabled_flags(flags)) {           \
                         raw_local_irq_restore(flags);           \
                         trace_hardirqs_off();                   \
@@ -69,8 +80,16 @@
  */
 # define raw_local_irq_disable()        local_irq_disable()
 # define raw_local_irq_enable()         local_irq_enable()
-# define raw_local_irq_save(flags)      local_irq_save(flags)
-# define raw_local_irq_restore(flags)   local_irq_restore(flags)
+# define raw_local_irq_save(flags)              \
+        do {                                    \
+                BUILD_CHECK_IRQ_FLAGS(flags);   \
+                local_irq_save(flags);          \
+        } while (0)
+# define raw_local_irq_restore(flags)           \
+        do {                                    \
+                BUILD_CHECK_IRQ_FLAGS(flags);   \
+                local_irq_restore(flags);       \
+        } while (0)
 #endif /* CONFIG_TRACE_IRQFLAGS_SUPPORT */
 
 #ifdef CONFIG_TRACE_IRQFLAGS_SUPPORT
@@ -80,7 +99,11 @@
                 raw_safe_halt();                                \
         } while (0)
 
-#define local_save_flags(flags)         raw_local_save_flags(flags)
+#define local_save_flags(flags)                 \
+        do {                                    \
+                BUILD_CHECK_IRQ_FLAGS(flags);   \
+                raw_local_save_flags(flags);    \
+        } while (0)
 
 #define irqs_disabled()                                         \
 ({                                                              \
@@ -90,7 +113,11 @@
         raw_irqs_disabled_flags(flags);                         \
 })
 
-#define irqs_disabled_flags(flags)      raw_irqs_disabled_flags(flags)
+#define irqs_disabled_flags(flags)      \
+({                                      \
+        BUILD_CHECK_IRQ_FLAGS(flags);   \
+        raw_irqs_disabled_flags(flags); \
+})
 #endif          /* CONFIG_X86 */
 
 #endif