diff options
author | 2009-02-11 11:38:55 +0100 | |
---|---|---|
committer | 2009-02-11 11:38:55 +0100 | |
commit | 891393745aad5c5acdb01b6ce61c08d4cc064649 (patch) | |
tree | 7687b8b94c4bc4ec8d5f1106ff8ff4d557b2fabf /include/linux/kernel.h | |
parent | x86: unify asm/io.h: IO_SPACE_LIMIT (diff) | |
parent | Linux 2.6.29-rc4 (diff) | |
download | wireguard-linux-891393745aad5c5acdb01b6ce61c08d4cc064649.tar.xz wireguard-linux-891393745aad5c5acdb01b6ce61c08d4cc064649.zip |
Merge commit 'v2.6.29-rc4' into x86/cleanups
Diffstat (limited to 'include/linux/kernel.h')
-rw-r--r-- | include/linux/kernel.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/kernel.h b/include/linux/kernel.h index 343df9ef2412..7fa371898e3e 100644 --- a/include/linux/kernel.h +++ b/include/linux/kernel.h @@ -480,7 +480,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 |