Merge branch 'linus' into core/printk

1 files changed, 2 insertions, 1 deletions

diff --git a/include/linux/kernel.h b/include/linux/kernel.h
index 3c183d9864ae..2755165bb291 100644
--- a/include/linux/kernel.h
+++ b/include/linux/kernel.h
@@ -497,7 +497,8 @@ static inline char *pack_hex_byte(char *buf, u8 byte)
 /*
  * swap - swap value of @a and @b
  */
-#define swap(a, b) ({ typeof(a) __tmp = (a); (a) = (b); (b) = __tmp; })
+#define swap(a, b) \
+        do { typeof(a) __tmp = (a); (a) = (b); (b) = __tmp; } while (0)
 
 /**
  * container_of - cast a member of a structure out to the containing structure