From b15716eed7459ad51cf4caafb9ee8e4a75e6b1aa Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes@sipsolutions.net>
Date: Mon, 6 Jul 2009 11:53:03 +0200
Subject: [PATCH] --- yaml --- r: 164660 b: refs/heads/master c:
 181f7c5dd3832763bdf2756b6d2d8a49bdf12791 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 95149131a33e..5c046ffc443b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e3c6c4a8af9e3c4588235444774e66b6483b10ad
+refs/heads/master: 181f7c5dd3832763bdf2756b6d2d8a49bdf12791
diff --git a/trunk/include/linux/kmemcheck.h b/trunk/include/linux/kmemcheck.h
index 47b39b7c7e84..06c6c5501f13 100644
--- a/trunk/include/linux/kmemcheck.h
+++ b/trunk/include/linux/kmemcheck.h
@@ -137,7 +137,10 @@ static inline void kmemcheck_mark_initialized_pages(struct page *p,
 	int name##_end[0];
 
 #define kmemcheck_annotate_bitfield(ptr, name)				\
-	do if (ptr) {							\
+	do {								\
+		if (!ptr)						\
+			break;						\
+									\
 		int _n = (long) &((ptr)->name##_end)			\
 			- (long) &((ptr)->name##_begin);		\
 		BUILD_BUG_ON(_n < 0);					\