s390: add missing "do {} while (0)" loop constructs to multiline macros

Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

diff --git a/arch/s390/include/asm/ctl_reg.h b/arch/s390/include/asm/ctl_reg.h
index cf4c9a106049f98ba9caa6d70f5a96ecfcc66033..d0441ad2a9900625d6179a08079f54b3ac3b44ae 100644 (file)
--- a/arch/s390/include/asm/ctl_reg.h
+++ b/arch/s390/include/asm/ctl_reg.h
@@ -9,7 +9,7 @@
 
 #include <linux/bug.h>
 
-#define __ctl_load(array, low, high) {                                 \
+#define __ctl_load(array, low, high) do {                              \
        typedef struct { char _[sizeof(array)]; } addrtype;             \
                                                                        \
        BUILD_BUG_ON(sizeof(addrtype) != (high - low + 1) * sizeof(long));\
@@ -18,9 +18,9 @@
                :                                                       \
                : "Q" (*(addrtype *)(&array)), "i" (low), "i" (high)    \
                : "memory");                                            \
-}
+} while (0)
 
-#define __ctl_store(array, low, high) {                                        \
+#define __ctl_store(array, low, high) do {                             \
        typedef struct { char _[sizeof(array)]; } addrtype;             \
                                                                        \
        BUILD_BUG_ON(sizeof(addrtype) != (high - low + 1) * sizeof(long));\
@@ -28,7 +28,7 @@
                "       stctg   %1,%2,%0\n"                             \
                : "=Q" (*(addrtype *)(&array))                          \
                : "i" (low), "i" (high));                               \
-}
+} while (0)
 
 static inline void __ctl_set_bit(unsigned int cr, unsigned int bit)
 {

diff --git a/arch/s390/include/asm/processor.h b/arch/s390/include/asm/processor.h
index 6bca916a5ba05a272ecdc5e252616963581d46cc..2e21c645343c874d1385312c863ea439f82a79b1 100644 (file)
--- a/arch/s390/include/asm/processor.h
+++ b/arch/s390/include/asm/processor.h
@@ -358,12 +358,12 @@ extern void (*s390_base_ext_handler_fn)(void);
 extern int memcpy_real(void *, void *, size_t);
 extern void memcpy_absolute(void *, void *, size_t);
 
-#define mem_assign_absolute(dest, val) {                       \
+#define mem_assign_absolute(dest, val) do {                    \
        __typeof__(dest) __tmp = (val);                         \
                                                                \
        BUILD_BUG_ON(sizeof(__tmp) != sizeof(val));             \
        memcpy_absolute(&(dest), &__tmp, sizeof(__tmp));        \
-}
+} while (0)
 
 #endif /* __ASSEMBLY__ */
 

diff --git a/arch/s390/include/asm/uaccess.h b/arch/s390/include/asm/uaccess.h
index 3d1d0f7b7d2896428764925dd762b50e08e8938b..b2988fc60f65e53db21815e5e3536ee178db7d06 100644 (file)
--- a/arch/s390/include/asm/uaccess.h
+++ b/arch/s390/include/asm/uaccess.h
@@ -38,13 +38,13 @@
 #define get_fs()        (current->thread.mm_segment)
 
 #define set_fs(x)                                                      \
-{                                                                      \
+do {                                                                   \
        unsigned long __pto;                                            \
        current->thread.mm_segment = (x);                               \
        __pto = current->thread.mm_segment.ar4 ?                        \
                S390_lowcore.user_asce : S390_lowcore.kernel_asce;      \
        __ctl_load(__pto, 7, 7);                                        \
-}
+} while (0)
 
 #define segment_eq(a,b) ((a).ar4 == (b).ar4)