Home » Mailing list archives » linux-kernel » 2008 » June » 27

[PATCH 38/39] put movsl_mask into uaccess.h

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
[view in full thread]
From: Glauber Costa
Subject: [PATCH 38/39] put movsl_mask into uaccess.h
Date: Friday, June 27, 2008 - 2:34 pm

x86_64 does not need it, but it won't have X86_INTEL_USERCOPY
defined either.

Signed-off-by: Glauber Costa <gcosta@redhat.com>
---
 include/asm-x86/uaccess.h    |    9 +++++++++
 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 4ebb992..ddc32fe 100644
--- a/include/asm-x86/uaccess.h
+++ b/include/asm-x86/uaccess.h
@@ -433,6 +433,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 d3b5bf8..3467749 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
-- 
1.5.5.1

--
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
Messages in current thread:
[PATCH 0/39] Merge files at x86/lib, Glauber Costa, (Fri Jun 27, 2:34 pm)
[PATCH 01/39] Don't use size specifiers, Glauber Costa, (Fri Jun 27, 2:34 pm)
[PATCH 02/39] provide delay loop for x86_64, Glauber Costa, (Fri Jun 27, 2:34 pm)
[PATCH 03/39] use rdtscll in read_current_timer for i386., Glauber Costa, (Fri Jun 27, 2:34 pm)
[PATCH 04/39] explicitly use edx in const delay function., Glauber Costa, (Fri Jun 27, 2:34 pm)
[PATCH 05/39] integrate delay functions, Glauber Costa, (Fri Jun 27, 2:34 pm)
[PATCH 06/39] use something common for both architectures, Glauber Costa, (Fri Jun 27, 2:34 pm)
[PATCH 07/39] don't clobber r8 nor use rcx, Glauber Costa, (Fri Jun 27, 2:34 pm)
[PATCH 08/39] don't use word-size specifiers, Glauber Costa, (Fri Jun 27, 2:34 pm)
[PATCH 09/39] adapt x86_64 getuser functions, Glauber Costa, (Fri Jun 27, 2:34 pm)
[PATCH 10/39] rename threadinfo to TI, Glauber Costa, (Fri Jun 27, 2:34 pm)
[PATCH 11/39] Don't use word-size specifiers on getuser_64, Glauber Costa, (Fri Jun 27, 2:34 pm)
[PATCH 12/39] introduce __ASM_REG macro, Glauber Costa, (Fri Jun 27, 2:34 pm)
[PATCH 13/39] use _ASM_PTR instead of explicit word-size p ..., Glauber Costa, (Fri Jun 27, 2:34 pm)
[PATCH 14/39] merge getuser asm functions, Glauber Costa, (Fri Jun 27, 2:34 pm)
[PATCH 15/39] don't save ebx in putuser_32.S, Glauber Costa, (Fri Jun 27, 2:34 pm)
[PATCH 16/39] user put_user_x instead of all variants., Glauber Costa, (Fri Jun 27, 2:34 pm)
[PATCH 17/39] clobber rbx in putuser_64.S, Glauber Costa, (Fri Jun 27, 2:34 pm)
[PATCH 18/39] pass argument to putuser_64 functions in ax ..., Glauber Costa, (Fri Jun 27, 2:34 pm)
[PATCH 19/39] change testing logic in putuser_64.S, Glauber Costa, (Fri Jun 27, 2:34 pm)
[PATCH 20/39] replace function headers by macros, Glauber Costa, (Fri Jun 27, 2:34 pm)
[PATCH 21/39] don't use word-size specifiers in putuser files, Glauber Costa, (Fri Jun 27, 2:34 pm)
[PATCH 22/39] use macros from asm.h, Glauber Costa, (Fri Jun 27, 2:34 pm)
[PATCH 23/39] merge putuser asm functions, Glauber Costa, (Fri Jun 27, 2:34 pm)
[PATCH 24/39] commonize __range_not_ok, Glauber Costa, (Fri Jun 27, 2:34 pm)
[PATCH 25/39] merge common parts of uaccess., Glauber Costa, (Fri Jun 27, 2:34 pm)
[PATCH 26/39] merge getuser, Glauber Costa, (Fri Jun 27, 2:34 pm)
[PATCH 27/39] move __addr_ok to uaccess.h, Glauber Costa, (Fri Jun 27, 2:34 pm)
[PATCH 28/39] use k modifier for 4-byte access., Glauber Costa, (Fri Jun 27, 2:34 pm)
[PATCH 29/39] mark x86_64 as having a working WP., Glauber Costa, (Fri Jun 27, 2:34 pm)
[PATCH 30/39] don't always use EFAULT on __put_user_size., Glauber Costa, (Fri Jun 27, 2:34 pm)
[PATCH 31/39] merge __put_user_asm and its user., Glauber Costa, (Fri Jun 27, 2:34 pm)
[PATCH 32/39] don't always use EFAULT on __get_user_size., Glauber Costa, (Fri Jun 27, 2:34 pm)
[PATCH 33/39] merge __get_user_asm and its users., Glauber Costa, (Fri Jun 27, 2:34 pm)
[PATCH 34/39] Be more explicit in __put_user_x, Glauber Costa, (Fri Jun 27, 2:34 pm)
[PATCH 35/39] turn __put_user_check directly into put_user., Glauber Costa, (Fri Jun 27, 2:34 pm)
[PATCH 36/39] merge put_user, Glauber Costa, (Fri Jun 27, 2:34 pm)
[PATCH 37/39] move __get_user and __put_user into uaccess.h, Glauber Costa, (Fri Jun 27, 2:34 pm)
[PATCH 38/39] put movsl_mask into uaccess.h, Glauber Costa, (Fri Jun 27, 2:34 pm)
[PATCH 39/39] define architectural characteristics in uacc ..., Glauber Costa, (Fri Jun 27, 2:34 pm)
Re: [PATCH 08/39] don't use word-size specifiers, H. Peter Anvin, (Fri Jun 27, 4:17 pm)
Re: [PATCH 08/39] don't use word-size specifiers, H. Peter Anvin, (Fri Jun 27, 4:22 pm)
Re: [PATCH 08/39] don't use word-size specifiers, Glauber Costa, (Fri Jun 27, 6:41 pm)
Re: [PATCH 08/39] don't use word-size specifiers, H. Peter Anvin, (Fri Jun 27, 10:09 pm)
Re: [PATCH 12/39] introduce __ASM_REG macro, Andi Kleen, (Sat Jun 28, 5:09 am)
Re: [PATCH 15/39] don't save ebx in putuser_32.S, Andi Kleen, (Sat Jun 28, 5:10 am)
Re: [PATCH 17/39] clobber rbx in putuser_64.S, Andi Kleen, (Sat Jun 28, 5:12 am)
Re: [PATCH 0/39] Merge files at x86/lib, H. Peter Anvin, (Sun Jun 29, 10:10 pm)
Re: [PATCH 25/39] merge common parts of uaccess., Ingo Molnar, (Sun Jun 29, 11:30 pm)
Re: [PATCH 25/39] merge common parts of uaccess., Ingo Molnar, (Sun Jun 29, 11:31 pm)
Re: [PATCH 25/39] merge common parts of uaccess., H. Peter Anvin, (Mon Jun 30, 9:31 am)
Re: [PATCH 25/39] merge common parts of uaccess., Glauber Costa, (Mon Jun 30, 11:48 am)
Re: [PATCH 25/39] merge common parts of uaccess., Ingo Molnar, (Mon Jun 30, 11:53 am)
Re: [PATCH 25/39] merge common parts of uaccess., Glauber Costa, (Mon Jun 30, 12:00 pm)
Re: [PATCH 25/39] merge common parts of uaccess., Ingo Molnar, (Mon Jun 30, 12:29 pm)
Re: [PATCH 15/39] don't save ebx in putuser_32.S, Glauber Costa, (Mon Jun 30, 1:43 pm)
Re: [PATCH 17/39] clobber rbx in putuser_64.S, Glauber Costa, (Mon Jun 30, 2:00 pm)
Re: [PATCH 17/39] clobber rbx in putuser_64.S, Glauber Costa, (Mon Jun 30, 2:40 pm)
Re: [PATCH 17/39] clobber rbx in putuser_64.S, Andi Kleen, (Mon Jun 30, 4:45 pm)
Re: [PATCH 17/39] clobber rbx in putuser_64.S, Glauber Costa, (Mon Jun 30, 7:46 pm)
Re: [PATCH 17/39] clobber rbx in putuser_64.S, Glauber Costa, (Tue Jul 1, 8:11 am)