diff options
author | Hugh Dickins <hugh@veritas.com> | 2008-11-02 00:41:40 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-11-02 00:41:40 -0400 |
commit | 145e1c0023585e0e8f6df22316308ec61c5066b2 (patch) | |
tree | c4070952481c43a020d7ee6630c3ba6bfb879b48 /arch/sparc | |
parent | 770a424112cb2c3a3e39221299eaf5244b76479a (diff) |
sparc64: Fix __copy_{to,from}_user_inatomic defines.
Alexander Beregalov reports oops in __bzero() called from
copy_from_user_fixup() called from iov_iter_copy_from_user_atomic(),
when running dbench on tmpfs on sparc64: its __copy_from_user_inatomic
and __copy_to_user_inatomic should be avoiding, not calling, the fixups.
Signed-off-by: Hugh Dickins <hugh@veritas.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc')
-rw-r--r-- | arch/sparc/include/asm/uaccess_64.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sparc/include/asm/uaccess_64.h b/arch/sparc/include/asm/uaccess_64.h index 296ef30e05c8..c64e767a3e4b 100644 --- a/arch/sparc/include/asm/uaccess_64.h +++ b/arch/sparc/include/asm/uaccess_64.h | |||
@@ -265,8 +265,8 @@ extern long __strnlen_user(const char __user *, long len); | |||
265 | 265 | ||
266 | #define strlen_user __strlen_user | 266 | #define strlen_user __strlen_user |
267 | #define strnlen_user __strnlen_user | 267 | #define strnlen_user __strnlen_user |
268 | #define __copy_to_user_inatomic __copy_to_user | 268 | #define __copy_to_user_inatomic ___copy_to_user |
269 | #define __copy_from_user_inatomic __copy_from_user | 269 | #define __copy_from_user_inatomic ___copy_from_user |
270 | 270 | ||
271 | #endif /* __ASSEMBLY__ */ | 271 | #endif /* __ASSEMBLY__ */ |
272 | 272 | ||