Commit-ID: df90ca969035d3f6c95044e272f75bf417b14245
Gitweb: http://git.kernel.org/tip/df90ca969035d3f6c95044e272f75bf417b14245
Author: Steven Rostedt <rost...@goodmis.org>
AuthorDate: Fri, 3 Jan 2014 16:45:00 -0500
Committer: H. Peter Anvin <h...@linux.intel.com>
CommitDate: Sat, 4 Jan 2014 13:54:50 -0800
x86, sparse: Do not force removal of __user when calling
copy_to/from_user_nocheck()
Commit ff47ab4ff3cdd "x86: Add 1/2/4/8 byte optimization to 64bit
__copy_{from,to}_user_inatomic" added a "_nocheck" call in between
the copy_to/from_user() and copy_user_generic(). As both the
normal and nocheck versions of theses calls use the proper __user
annotation, a typecast to remove it should not be added.
This causes sparse to spin out the following warnings:
arch/x86/include/asm/uaccess_64.h:207:47: warning: incorrect type in argument 2
(different address spaces)
arch/x86/include/asm/uaccess_64.h:207:47: expected void const [noderef]
<asn:1>*src
arch/x86/include/asm/uaccess_64.h:207:47: got void const *<noident>
arch/x86/include/asm/uaccess_64.h:207:47: warning: incorrect type in argument 2
(different address spaces)
arch/x86/include/asm/uaccess_64.h:207:47: expected void const [noderef]
<asn:1>*src
arch/x86/include/asm/uaccess_64.h:207:47: got void const *<noident>
arch/x86/include/asm/uaccess_64.h:207:47: warning: incorrect type in argument 2
(different address spaces)
arch/x86/include/asm/uaccess_64.h:207:47: expected void const [noderef]
<asn:1>*src
arch/x86/include/asm/uaccess_64.h:207:47: got void const *<noident>
arch/x86/include/asm/uaccess_64.h:207:47: warning: incorrect type in argument 2
(different address spaces)
arch/x86/include/asm/uaccess_64.h:207:47: expected void const [noderef]
<asn:1>*src
arch/x86/include/asm/uaccess_64.h:207:47: got void const *<noident>
Cc: Andi Kleen <a...@linux.intel.com>
Signed-off-by: Steven Rostedt <rost...@goodmis.org>
Link: http://lkml.kernel.org/r/20140103164500.5f647...@gandalf.local.home
Signed-off-by: H. Peter Anvin <h...@linux.intel.com>
---
arch/x86/include/asm/uaccess_64.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/x86/include/asm/uaccess_64.h
b/arch/x86/include/asm/uaccess_64.h
index 190413d..12a26b9 100644
--- a/arch/x86/include/asm/uaccess_64.h
+++ b/arch/x86/include/asm/uaccess_64.h
@@ -204,13 +204,13 @@ int __copy_in_user(void __user *dst, const void __user
*src, unsigned size)
static __must_check __always_inline int
__copy_from_user_inatomic(void *dst, const void __user *src, unsigned size)
{
- return __copy_from_user_nocheck(dst, (__force const void *)src, size);
+ return __copy_from_user_nocheck(dst, src, size);
}
static __must_check __always_inline int
__copy_to_user_inatomic(void __user *dst, const void *src, unsigned size)
{
- return __copy_to_user_nocheck((__force void *)dst, src, size);
+ return __copy_to_user_nocheck(dst, src, size);
}
extern long __copy_user_nocache(void *dst, const void __user *src,
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
