Re: 2.6.16-rc1-mm4

[Brice Goglin <Brice.Goglin@ens-lyon.org>]

Andrew Morton wrote:

>ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.16-rc1/2.6.16-rc1-mm4/
>
>- New git tree `git-davej-x86.patch': misc x86 things, maintained by David
>  Jones.
>
>- Lots of USB updates.  Please be sure to Cc:
>  linux-usb-devel@lists.sourceforge.net if something broke.
>
>- Various other random bits and pieces.  Things have been pretty quiet
>  lately - most activity seems to be concentrated about putting bugs into the
>  various subsystem trees.
>
>- If you have a patch in -mm which you think should go into 2.6.16, it
>  doesn't hurt to remind me.  There's quite a lot here which will go into
>  2.6.16.
>  
>
Hi Andrew,

I get a lot of warnings like this one:
sound/core/seq/oss/seq_oss_ioctl.c:122: warning: ISO C90 forbids mixed
declarations and code

They appear to be caused by put_user. The following patch should fix that.

Signed-off-by: Brice Goglin <Brice.Goglin@ens-lyon.org>

Brice


--- linux-mm/include/asm-i386/uaccess.h.old	2006-01-29 18:37:02.000000000 -0500
+++ linux-mm/include/asm-i386/uaccess.h	2006-01-29 18:37:35.000000000 -0500
@@ -197,8 +197,8 @@ extern void __put_user_8(void);
 
 #define put_user(x,ptr)						\
 ({	int __ret_pu;						\
-	__chk_user_ptr(ptr);					\
 	__typeof__(*(ptr)) __pu_val = x;			\
+	__chk_user_ptr(ptr);					\
 	switch(sizeof(*(ptr))) {				\
 	case 1: __put_user_1(__pu_val, ptr); break;		\
 	case 2: __put_user_2(__pu_val, ptr); break;		\