From: Lars-Peter Clausen Date: Mon, 22 Oct 2012 14:09:04 +0000 (+0200) Subject: Blackfin: Annotate clear_user 'to' parameter with __user X-Git-Tag: v3.8-rc1~64^2~8 X-Git-Url: https://git.kernelconcepts.de/?a=commitdiff_plain;h=10dc42b5b262f3bb2e4532759e4e1147ebf6a22f;p=karo-tx-linux.git Blackfin: Annotate clear_user 'to' parameter with __user The 'to' parameter of clear_user is supposed to take a userspace pointer, so annotate it with __user. This fixes the following and similar sparse warnings: fs/binfmt_elf_fdpic.c:714:35: warning: incorrect type in argument 1 (different address spaces) fs/binfmt_elf_fdpic.c:714:35: expected void [noderef] *to fs/binfmt_elf_fdpic.c:714:35: got void * fs/binfmt_elf_fdpic.c:1119:29: warning: incorrect type in argument 1 (different address spaces) fs/binfmt_elf_fdpic.c:1119:29: expected void *to fs/binfmt_elf_fdpic.c:1119:29: got void [noderef] * Signed-off-by: Lars-Peter Clausen Signed-off-by: Bob Liu --- diff --git a/arch/blackfin/include/asm/uaccess.h b/arch/blackfin/include/asm/uaccess.h index 90f32c2a65bb..ded2d05847fa 100644 --- a/arch/blackfin/include/asm/uaccess.h +++ b/arch/blackfin/include/asm/uaccess.h @@ -256,11 +256,11 @@ static inline long __must_check strlen_user(const char *src) */ static inline unsigned long __must_check -__clear_user(void *to, unsigned long n) +__clear_user(void __user *to, unsigned long n) { if (!access_ok(VERIFY_WRITE, to, n)) return n; - memset(to, 0, n); + memset((void __force *)to, 0, n); return 0; }