diff options
Diffstat (limited to 'arch/sparc/include/asm/uaccess_64.h')
| -rw-r--r-- | arch/sparc/include/asm/uaccess_64.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc/include/asm/uaccess_64.h b/arch/sparc/include/asm/uaccess_64.h index dbc141660994..2406788bfe5f 100644 --- a/arch/sparc/include/asm/uaccess_64.h +++ b/arch/sparc/include/asm/uaccess_64.h | |||
| @@ -221,8 +221,8 @@ extern unsigned long copy_from_user_fixup(void *to, const void __user *from, | |||
| 221 | static inline unsigned long __must_check | 221 | static inline unsigned long __must_check |
| 222 | copy_from_user(void *to, const void __user *from, unsigned long size) | 222 | copy_from_user(void *to, const void __user *from, unsigned long size) |
| 223 | { | 223 | { |
| 224 | unsigned long ret = (unsigned long) -EFAULT; | ||
| 225 | int sz = __compiletime_object_size(to); | 224 | int sz = __compiletime_object_size(to); |
| 225 | unsigned long ret = size; | ||
| 226 | 226 | ||
| 227 | if (likely(sz == -1 || sz >= size)) { | 227 | if (likely(sz == -1 || sz >= size)) { |
| 228 | ret = ___copy_from_user(to, from, size); | 228 | ret = ___copy_from_user(to, from, size); |
