Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux

[mirror_ubuntu-artful-kernel.git] / arch / s390 / include / asm / processor.h

diff --git a/arch/s390/include/asm/processor.h b/arch/s390/include/asm/processor.h
index 977a5b6501b879a043cc3544f0c8fa299723293a..dacba341e47594463a1ed12c44f21879e9d1a0a2 100644 (file)
--- a/arch/s390/include/asm/processor.h
+++ b/arch/s390/include/asm/processor.h
@@ -361,12 +361,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__ */