Skip to contentSkip to conversation

include/linux/kmemcheck.h: fix a sparse warning

PATCH Bart Van Assche 1 participant 1 message Sep 26, 2009

lore
Share & tools
lore
#0 lore raw

Checking a 2.6.31.1 kernel configured with allyesconfig/allmodconfig with sparse (make C=2) triggers a sparse warning on code that uses the kmemcheck_annotate_bitfield() macro. An example of such a warning:

include/net/inet_sock.h:208:17: warning: do-while statement is not a compound statement

Cc Vegard Nossum <[email protected]>
Cc Andrew Morton <[email protected]>
include/linux/kmemcheck.h renamed from include/linux/kmemcheck-orig.h +2 -2
@@ -137,13 +137,13 @@ static inline void kmemcheck_mark_initia
 	int name##_end[0];
 
 #define kmemcheck_annotate_bitfield(ptr, name)				\
-	do if (ptr) {							\
+	do { if (ptr) {							\
 		int _n = (long) &((ptr)->name##_end)			\
 			- (long) &((ptr)->name##_begin);		\
 		BUILD_BUG_ON(_n < 0);					\
 									\
 		kmemcheck_mark_initialized(&((ptr)->name##_begin), _n);	\
-	} while (0)
+	} } while (0)
 
 #define kmemcheck_annotate_variable(var)				\
 	do {								\