diff options
author | 2009-02-25 16:40:10 +0100 | |
---|---|---|
committer | 2009-02-25 16:40:10 +0100 | |
commit | 2e31add2a7e2a15d07f592c21ba35870fa9a1d1f (patch) | |
tree | 814e2c70fb5528f108114c0da6e5a1e219e6a0e1 /include/linux/kernel.h | |
parent | x86 PAT: ioremap_wc should take resource_size_t parameter (diff) | |
parent | gpu/drm, x86, PAT: PAT support for io_mapping_* (diff) | |
download | wireguard-linux-2e31add2a7e2a15d07f592c21ba35870fa9a1d1f.tar.xz wireguard-linux-2e31add2a7e2a15d07f592c21ba35870fa9a1d1f.zip |
Merge branch 'x86/urgent' into x86/pat
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 |