From: Andrew Morton <akpm@osdl.org>

Cc: Daniel Walker <dwalker@mvista.com>
Cc: Hua Zhong <hzhong@gmail.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 include/linux/compiler.h |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff -puN include/linux/compiler.h~profile-likely-unlikely-macros-fix-2 include/linux/compiler.h
--- 25/include/linux/compiler.h~profile-likely-unlikely-macros-fix-2	Thu Apr 27 16:08:03 2006
+++ 25-akpm/include/linux/compiler.h	Thu Apr 27 16:17:36 2006
@@ -73,12 +73,13 @@ extern int do_check_likely(struct likeli
 			.func = __func__,				\
 			.file = __FILE__,				\
 			.line = __LINE__,				\
-			.type = is_likely | LP_UNSEEN,			\			};							\
+			.type = is_likely | LP_UNSEEN,			\
+		};							\
 		do_check_likely(&likeliness, !!(exp));			\
 	})
 
-#define likely(x)	__check_likely(x, 1)
-#define unlikely(x)	__check_likely(x, 0)
+#define likely(x)	__check_likely((x), 1)
+#define unlikely(x)	__check_likely((x), 0)
 #else
 /*
  * Generic compiler-dependent macros required for kernel
_