Commit ac7b9004 authored by Peter Zijlstra's avatar Peter Zijlstra Committed by Linus Torvalds

generic swap(): don't return a value from swap()

The swap() macro is accidentally retuning the value of its first argument.
Change it into a doesn't-return-anything macro before someone goes and
relies upon this behaviour.
Signed-off-by: default avatarPeter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Wu Fengguang <wfg@linux.intel.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent c073b2db
...@@ -480,7 +480,8 @@ static inline char *pack_hex_byte(char *buf, u8 byte) ...@@ -480,7 +480,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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment