Re: v2.6.31-7381-g7fa0772: new build warnings: kmemcheck, __deprecated, hugetlb, radeon

[Jean Delvare <khali@linux-fr.org>]

Hi Stefan,

On Tue, 22 Sep 2009 18:34:16 +0200, Stefan Richter wrote:
> Latest git compiles with extreme noise:
> 
> In file included from include/net/inet_connection_sock.h:23,
>                   from include/linux/tcp.h:178,
>                   from include/linux/ipv6.h:215,
>                   from include/net/ipv6.h:16,
>                   from include/linux/sunrpc/clnt.h:25,
>                   from include/linux/nfs_fs.h:52,
>                   from kernel/sysctl.c:48:
> include/net/inet_sock.h: In function 'inet_reqsk_alloc':
> include/net/inet_sock.h:208: warning: ISO C90 forbids mixed declarations 
> and code
> 
> Vegard, this is obviously caused by commit 
> 45e3ff82708c65c895d5c5882aff17ecf62a80b5.

Actually not, it's caused by commit
181f7c5dd3832763bdf2756b6d2d8a49bdf12791
(kmemcheck: add missing braces to do-while in kmemcheck_annotate_bitfield)

And the fix would be:

From: Jean Delvare <khali@linux-fr.org>
Subject: Fix build warning in kmemcheck_annotate_bitfield

Fix the following build warning:

include/net/inet_sock.h: In function 'inet_reqsk_alloc':
include/net/inet_sock.h:208: warning: ISO C90 forbids mixed declarations 
and code

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Cc: Johannes Berg <johannes@sipsolutions.net>
Cc: Signed-off-by: Vegard Nossum <vegard.nossum@gmail.com>
---
 include/linux/kmemcheck.h |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--- linux-2.6.32-pre.orig/include/linux/kmemcheck.h	2009-09-23 08:19:34.000000000 +0200
+++ linux-2.6.32-pre/include/linux/kmemcheck.h	2009-09-23 09:05:30.000000000 +0200
@@ -145,10 +145,12 @@ static inline bool kmemcheck_is_obj_init
 
 #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);					\
 									\

-- 
Jean Delvare