aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Morton <akpm@linux-foundation.org>2009-09-22 16:43:27 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-09-23 07:39:27 -0700
commitfa081b00a80ef3f4575c99af6e97d29e1628cf51 (patch)
tree7124419e4f0bb4789d2c2e3b909dc1046c2bbe20
parent7fa07729e439a6184bd824746d06a49cca553f15 (diff)
downloadlinux-linaro-fa081b00a80ef3f4575c99af6e97d29e1628cf51.tar.gz
include/linux/kmemcheck.h: fix a trillion warnings
of the form include/net/inet_sock.h:208: warning: ISO C90 forbids mixed declarations and code Cc: Johannes Berg <johannes@sipsolutions.net> Acked-by: Vegard Nossum <vegard.nossum@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--include/linux/kmemcheck.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/include/linux/kmemcheck.h b/include/linux/kmemcheck.h
index c8006607f94..136cdcdf92e 100644
--- a/include/linux/kmemcheck.h
+++ b/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); \
\