diff options
| author | Glauber Costa <gcosta@redhat.com> | 2008-06-25 19:53:41 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-09 09:14:28 +0200 |
| commit | 8bc7de0c5dc0a5d3bcdc04bac6de0c799f91c5e4 (patch) | |
| tree | c1f8dfbe35c408f41d89d345a0f8bf03d2af5dd9 /include | |
| parent | x86: move __get_user and __put_user into uaccess.h. (diff) | |
| download | linux-8bc7de0c5dc0a5d3bcdc04bac6de0c799f91c5e4.tar.xz linux-8bc7de0c5dc0a5d3bcdc04bac6de0c799f91c5e4.zip | |
x86: put movsl_mask into uaccess.h.
x86_64 does not need it, but it won't have X86_INTEL_USERCOPY
defined either.
Signed-off-by: Glauber Costa <gcosta@redhat.com>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-x86/uaccess.h | 9 | ||||
| -rw-r--r-- | include/asm-x86/uaccess_32.h | 9 |
2 files changed, 9 insertions, 9 deletions
diff --git a/include/asm-x86/uaccess.h b/include/asm-x86/uaccess.h index 7c7b46af6368..0c4ab788d017 100644 --- a/include/asm-x86/uaccess.h +++ b/include/asm-x86/uaccess.h @@ -432,6 +432,15 @@ struct __large_struct { unsigned long buf[100]; }; #define __get_user_unaligned __get_user #define __put_user_unaligned __put_user +/* + * movsl can be slow when source and dest are not both 8-byte aligned + */ +#ifdef CONFIG_X86_INTEL_USERCOPY +extern struct movsl_mask { + int mask; +} ____cacheline_aligned_in_smp movsl_mask; +#endif + #ifdef CONFIG_X86_32 # include "uaccess_32.h" #else diff --git a/include/asm-x86/uaccess_32.h b/include/asm-x86/uaccess_32.h index d3b5bf88ea86..3467749c6beb 100644 --- a/include/asm-x86/uaccess_32.h +++ b/include/asm-x86/uaccess_32.h @@ -11,15 +11,6 @@ #include <asm/asm.h> #include <asm/page.h> -/* - * movsl can be slow when source and dest are not both 8-byte aligned - */ -#ifdef CONFIG_X86_INTEL_USERCOPY -extern struct movsl_mask { - int mask; -} ____cacheline_aligned_in_smp movsl_mask; -#endif - unsigned long __must_check __copy_to_user_ll (void __user *to, const void *from, unsigned long n); unsigned long __must_check __copy_from_user_ll |