From a8b524721bd65b2d3149a3066c9e88c4d970ff41 Mon Sep 17 00:00:00 2001 From: Lars-Peter Clausen Date: Mon, 22 Oct 2012 16:09:04 +0200 Subject: [PATCH] --- yaml --- r: 346852 b: refs/heads/master c: 10dc42b5b262f3bb2e4532759e4e1147ebf6a22f h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/blackfin/include/asm/uaccess.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index e9fda01577d6..229e5204c511 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: aff06631da3c8349149fe4214091735b35294151 +refs/heads/master: 10dc42b5b262f3bb2e4532759e4e1147ebf6a22f diff --git a/trunk/arch/blackfin/include/asm/uaccess.h b/trunk/arch/blackfin/include/asm/uaccess.h index 90f32c2a65bb..ded2d05847fa 100644 --- a/trunk/arch/blackfin/include/asm/uaccess.h +++ b/trunk/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; }