Ath5k: suspend/resume fixes

[linux-2.6] / include / asm-x86 / uaccess.h

diff --git a/include/asm-x86/uaccess.h b/include/asm-x86/uaccess.h
index 7c7b46af63688276139dae418d531b0d3841b3b8..5f702d1d52184424941d3238ee82597c9f05ce37 100644 (file)
--- a/include/asm-x86/uaccess.h
+++ b/include/asm-x86/uaccess.h
@@ -432,10 +432,23 @@ 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
+
+#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
 
 #endif
+