Merge branch 'linus' into core/printk

[sfrench/cifs-2.6.git] / include / linux / kernel.h

diff --git a/include/linux/kernel.h b/include/linux/kernel.h
index 3c183d9864ae5a99faf202a80b31bc7cd257c5ff..2755165bb291d0783a34fc88396a602af6157461 100644 (file)
--- 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
  */
 /*
  * 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
 
 /**
  * container_of - cast a member of a structure out to the containing structure