diff options
| author | Hugh Dickins <hugh@veritas.com> | 2008-11-01 21:41:40 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-11-01 21:41:40 -0700 |
| commit | 145e1c0023585e0e8f6df22316308ec61c5066b2 (patch) | |
| tree | c4070952481c43a020d7ee6630c3ba6bfb879b48 /arch/sparc | |
| parent | 770a424112cb2c3a3e39221299eaf5244b76479a (diff) | |
| download | op-kernel-dev-145e1c0023585e0e8f6df22316308ec61c5066b2.zip op-kernel-dev-145e1c0023585e0e8f6df22316308ec61c5066b2.tar.gz | |
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 296ef30..c64e767 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); #define strlen_user __strlen_user #define strnlen_user __strnlen_user -#define __copy_to_user_inatomic __copy_to_user -#define __copy_from_user_inatomic __copy_from_user +#define __copy_to_user_inatomic ___copy_to_user +#define __copy_from_user_inatomic ___copy_from_user #endif /* __ASSEMBLY__ */ |
