x86: define architectural characteristics in uaccess.h.
authorGlauber Costa <gcosta@redhat.com>
Wed, 25 Jun 2008 17:56:53 +0000 (14:56 -0300)
committerIngo Molnar <mingo@elte.hu>
Wed, 9 Jul 2008 07:14:29 +0000 (09:14 +0200)
Remove them from the arch-specific file.

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>
include/asm-x86/uaccess.h
include/asm-x86/uaccess_32.h
include/asm-x86/uaccess_64.h

index 0c4ab788d0171ad07131a8271a266f9e22eabe32..f6fa4d841bbcd3cbd552bb205c84facc688bf050 100644 (file)
@@ -441,9 +441,12 @@ extern struct movsl_mask {
 } ____cacheline_aligned_in_smp movsl_mask;
 #endif
 
+#define ARCH_HAS_NOCACHE_UACCESS 1
+
 #ifdef CONFIG_X86_32
 # include "uaccess_32.h"
 #else
+# define ARCH_HAS_SEARCH_EXTABLE
 # include "uaccess_64.h"
 #endif
 
index 3467749c6beb7253f3bc3919739f8a1ff9f26478..6fdef39a0bcb849d86e3bb0e1ade448694d21cdb 100644 (file)
@@ -156,8 +156,6 @@ __copy_from_user(void *to, const void __user *from, unsigned long n)
        return __copy_from_user_ll(to, from, n);
 }
 
-#define ARCH_HAS_NOCACHE_UACCESS
-
 static __always_inline unsigned long __copy_from_user_nocache(void *to,
                                const void __user *from, unsigned long n)
 {
index b5bacd6136861db1c71facdbefa4d47a4b8edb5b..4e3ec004e14a53973c4d51a30ecaa8731106cc3e 100644 (file)
@@ -9,8 +9,6 @@
 #include <linux/prefetch.h>
 #include <asm/page.h>
 
-#define ARCH_HAS_SEARCH_EXTABLE
-
 /*
  * Copy To/From Userspace
  */
@@ -180,7 +178,6 @@ __copy_to_user_inatomic(void __user *dst, const void *src, unsigned size)
        return copy_user_generic((__force void *)dst, src, size);
 }
 
-#define ARCH_HAS_NOCACHE_UACCESS 1
 extern long __copy_user_nocache(void *dst, const void __user *src,
                                unsigned size, int zerorest);