aboutsummaryrefslogtreecommitdiff
path: root/include/asm-x86
diff options
context:
space:
mode:
authorGlauber Costa <gcosta@redhat.com>2008-06-25 14:56:53 -0300
committerIngo Molnar <mingo@elte.hu>2008-07-09 09:14:29 +0200
commit22cac1670786108ccd4caa0656c39fa4ba69fa7d (patch)
tree78ee156fca08987686199c7b330c413ff2a35ac5 /include/asm-x86
parent8bc7de0c5dc0a5d3bcdc04bac6de0c799f91c5e4 (diff)
x86: define architectural characteristics in uaccess.h.
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>
Diffstat (limited to 'include/asm-x86')
-rw-r--r--include/asm-x86/uaccess.h3
-rw-r--r--include/asm-x86/uaccess_32.h2
-rw-r--r--include/asm-x86/uaccess_64.h3
3 files changed, 3 insertions, 5 deletions
diff --git a/include/asm-x86/uaccess.h b/include/asm-x86/uaccess.h
index 0c4ab788d01..f6fa4d841bb 100644
--- a/include/asm-x86/uaccess.h
+++ b/include/asm-x86/uaccess.h
@@ -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
diff --git a/include/asm-x86/uaccess_32.h b/include/asm-x86/uaccess_32.h
index 3467749c6be..6fdef39a0bc 100644
--- a/include/asm-x86/uaccess_32.h
+++ b/include/asm-x86/uaccess_32.h
@@ -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)
{
diff --git a/include/asm-x86/uaccess_64.h b/include/asm-x86/uaccess_64.h
index b5bacd61368..4e3ec004e14 100644
--- a/include/asm-x86/uaccess_64.h
+++ b/include/asm-x86/uaccess_64.h
@@ -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);