[PATCH] warn about cli, sti & co uses even on UP

These don't exist on SMP at all, at least warn on compiling for UP.

Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h
index 991831cff1da88923d678a3b178a95aa84675ea4..d99e7aeb7d338a9fde859840ab4aff555f20e488 100644 (file)
--- a/include/linux/interrupt.h
+++ b/include/linux/interrupt.h
@@ -61,12 +61,30 @@ extern void enable_irq(unsigned int irq);
  * Temporary defines for UP kernels, until all code gets fixed.
  */
 #ifndef CONFIG_SMP
-# define cli()                 local_irq_disable()
-# define sti()                 local_irq_enable()
-# define save_flags(x)         local_save_flags(x)
-# define restore_flags(x)      local_irq_restore(x)
-# define save_and_cli(x)       local_irq_save(x)
-#endif
+static inline void __deprecated cli(void)
+{
+       local_irq_disable();
+}
+static inline void __deprecated sti(void)
+{
+       local_irq_enable();
+}
+static inline void __deprecated save_flags(unsigned long *x)
+{
+       local_save_flags(*x);
+}
+#define save_flags(x) save_flags(&x);
+static inline void __deprecated restore_flags(unsigned long x)
+{
+       local_irq_restore(x);
+}
+
+static inline void __deprecated save_and_cli(unsigned long *x)
+{
+       local_irq_save(*x);
+}
+#define save_and_cli(x)        save_and_cli(&x)
+#endif /* CONFIG_SMP */
 
 /* SoftIRQ primitives.  */
 #define local_bh_disable() \