Merge branch 'linux-next' of git://git.infradead.org/~dedekind/ubi-2.6

[mv-sheeva.git] / include / asm-x86 / uaccess.h

diff --git a/include/asm-x86/uaccess.h b/include/asm-x86/uaccess.h
index 0c4ab788d0171ad07131a8271a266f9e22eabe32..f6fa4d841bbcd3cbd552bb205c84facc688bf050 100644 (file)
--- 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