The patch titled generic swap(): don't return a value from swap() has been removed from the -mm tree. Its filename was generic-swap-dont-return-a-value-from-swap.patch This patch was dropped because it was merged into mainline or a subsystem tree The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: generic swap(): don't return a value from swap() From: Peter Zijlstra <peterz@xxxxxxxxxxxxx> 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: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx> Cc: Wu Fengguang <wfg@xxxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- include/linux/kernel.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff -puN include/linux/kernel.h~generic-swap-dont-return-a-value-from-swap include/linux/kernel.h --- a/include/linux/kernel.h~generic-swap-dont-return-a-value-from-swap +++ a/include/linux/kernel.h @@ -480,7 +480,8 @@ static inline char *pack_hex_byte(char * /* * 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 _ Patches currently in -mm which might be from peterz@xxxxxxxxxxxxx are origin.patch mm-fix-dirty_bytes-dirty_background_bytes-sysctls-on-64bit-arches.patch mm-fix-dirty_bytes-dirty_background_bytes-sysctls-on-64bit-arches-fix.patch linux-next.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html