From 4ce1a219916e842be4252343c6945e03de8bc26b Mon Sep 17 00:00:00 2001
From: Andrew Morton <akpm@linux-foundation.org>
Date: Tue, 22 Sep 2009 16:43:27 -0700
Subject: [PATCH] --- yaml --- r: 164664 b: refs/heads/master c:
 fa081b00a80ef3f4575c99af6e97d29e1628cf51 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 93f83d1c5517..8b68105b2626 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7fa07729e439a6184bd824746d06a49cca553f15
+refs/heads/master: fa081b00a80ef3f4575c99af6e97d29e1628cf51
diff --git a/trunk/include/linux/kmemcheck.h b/trunk/include/linux/kmemcheck.h
index c8006607f947..136cdcdf92ef 100644
--- a/trunk/include/linux/kmemcheck.h
+++ b/trunk/include/linux/kmemcheck.h
@@ -145,10 +145,12 @@ static inline bool kmemcheck_is_obj_initialized(unsigned long addr, size_t size)
 
 #define kmemcheck_annotate_bitfield(ptr, name)				\
 	do {								\
+		int _n;							\
+									\
 		if (!ptr)						\
 			break;						\
 									\
-		int _n = (long) &((ptr)->name##_end)			\
+		_n = (long) &((ptr)->name##_end)			\
 			- (long) &((ptr)->name##_begin);		\
 		BUILD_BUG_ON(_n < 0);					\
 									\