Skip to contentSkip to conversation

s390: raw_local_save_flags/raw_local_irq_restore type check

PATCH New Martin Schwidefsky 1 participant 1 message Jul 4, 2006

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 s390: raw_local_save_flags/raw_local_irq_restore type check

From: Heiko Carstens <[email protected]>

[S390] raw_local_save_flags/raw_local_irq_restore type check

Make sure that raw_local_save_flags and raw_local_irq_restore always get an unsigned long parameter. raw_irqs_disabled should call raw_local_save_flags instead of local_save_flags.

---

 include/asm-s390/irqflags.h |   18 ++++++++++++------
 1 files changed, 12 insertions(+), 6 deletions(-)
include/asm-s390/irqflags.h +12 -6
diff -urpN linux-2.6/include/asm-s390/irqflags.h linux-2.6-patched/include/asm-s390/irqflags.h
@@ -25,16 +25,22 @@
 	__flags; \
 	})
 
-#define raw_local_save_flags(x) \
-	__asm__ __volatile__("stosm 0(%1),0" : "=m" (x) : "a" (&x), "m" (x) )
-
-#define raw_local_irq_restore(x) \
-	__asm__ __volatile__("ssm   0(%0)" : : "a" (&x), "m" (x) : "memory")
+#define raw_local_save_flags(x)							\
+do {										\
+	typecheck(unsigned long, x);						\
+	__asm__ __volatile__("stosm 0(%1),0" : "=m" (x) : "a" (&x), "m" (x) );	\
+} while (0)
+
+#define raw_local_irq_restore(x)						\
+do {										\
+	typecheck(unsigned long, x);						\
+	__asm__ __volatile__("ssm   0(%0)" : : "a" (&x), "m" (x) : "memory");	\
+} while (0)
 
 #define raw_irqs_disabled()		\
 ({					\
 	unsigned long flags;		\
-	local_save_flags(flags);	\
+	raw_local_save_flags(flags);	\
 	!((flags >> __FLAG_SHIFT) & 3);	\
 })