From 86096f87ed9f8f937d251608e9e31c5d4096b84e Mon Sep 17 00:00:00 2001
From: Peter Zijlstra <peterz@infradead.org>
Date: Wed, 4 Feb 2009 15:11:59 -0800
Subject: [PATCH] --- yaml --- r: 130961 b: refs/heads/master c:
 ac7b9004909d03d67016368093e81d37cae72895 h: refs/heads/master i:   130959:
 3981cd1878a376d81ec530442bcd782425d68cc4 v: v3

---
 [refs]                       | 2 +-
 trunk/include/linux/kernel.h | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 242144c3301f..69b5f5c9eaf6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c073b2db006ba9370be1eecc36a1be1d9ce31310
+refs/heads/master: ac7b9004909d03d67016368093e81d37cae72895
diff --git a/trunk/include/linux/kernel.h b/trunk/include/linux/kernel.h
index 343df9ef2412..7fa371898e3e 100644
--- a/trunk/include/linux/kernel.h
+++ b/trunk/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