diff --git a/[refs] b/[refs]
index 19ad312f5a07..3d6373794808 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 350c20a6fd24b2a3265f7ca440aa17570e89e2cd
+refs/heads/master: 6225d85f171f8b7a776850d30352bd196f9bd0d6
diff --git a/trunk/arch/m68k/lib/checksum.c b/trunk/arch/m68k/lib/checksum.c
index 4a5c5445c610..cb13c6e3ccae 100644
--- a/trunk/arch/m68k/lib/checksum.c
+++ b/trunk/arch/m68k/lib/checksum.c
@@ -134,7 +134,7 @@ EXPORT_SYMBOL(csum_partial);
  */
 
 unsigned int
-csum_partial_copy_from_user(const unsigned char *src, unsigned char *dst,
+csum_partial_copy_from_user(const unsigned char __user *src, unsigned char *dst,
 			    int len, int sum, int *csum_err)
 {
 	/*
diff --git a/trunk/include/asm-m68k/checksum.h b/trunk/include/asm-m68k/checksum.h
index 78860c20db01..17280ef719f5 100644
--- a/trunk/include/asm-m68k/checksum.h
+++ b/trunk/include/asm-m68k/checksum.h
@@ -25,7 +25,7 @@ unsigned int csum_partial(const unsigned char * buff, int len, unsigned int sum)
  * better 64-bit) boundary
  */
 
-extern unsigned int csum_partial_copy_from_user(const unsigned char *src,
+extern unsigned int csum_partial_copy_from_user(const unsigned char __user *src,
 						unsigned char *dst,
 						int len, int sum,
 						int *csum_err);