From d99ea9e36310806d4eda235c75e716c0c414fe18 Mon Sep 17 00:00:00 2001
From: Glauber Costa <gcosta@redhat.com>
Date: Wed, 25 Jun 2008 14:56:53 -0300
Subject: [PATCH] --- yaml --- r: 100082 b: refs/heads/master c:
 22cac1670786108ccd4caa0656c39fa4ba69fa7d h: refs/heads/master v: v3

---
 [refs]                             | 2 +-
 trunk/include/asm-x86/uaccess.h    | 3 +++
 trunk/include/asm-x86/uaccess_32.h | 2 --
 trunk/include/asm-x86/uaccess_64.h | 3 ---
 4 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index fd3c91a5487a..c729c761d704 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8bc7de0c5dc0a5d3bcdc04bac6de0c799f91c5e4
+refs/heads/master: 22cac1670786108ccd4caa0656c39fa4ba69fa7d
diff --git a/trunk/include/asm-x86/uaccess.h b/trunk/include/asm-x86/uaccess.h
index 0c4ab788d017..f6fa4d841bbc 100644
--- a/trunk/include/asm-x86/uaccess.h
+++ b/trunk/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/trunk/include/asm-x86/uaccess_32.h b/trunk/include/asm-x86/uaccess_32.h
index 3467749c6beb..6fdef39a0bcb 100644
--- a/trunk/include/asm-x86/uaccess_32.h
+++ b/trunk/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/trunk/include/asm-x86/uaccess_64.h b/trunk/include/asm-x86/uaccess_64.h
index b5bacd613686..4e3ec004e14a 100644
--- a/trunk/include/asm-x86/uaccess_64.h
+++ b/trunk/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);