[2/4] [2.6 patch] better i386 CPU selection

[Adrian Bunk <bunk@fs.tum.de>]

- move "struct movsl_mask movsl_mask" to usercopy.c
  (CONFIG_X86_INTEL_USERCOPY is used on non-Intel CPUs)

diffstat output:

 kernel/cpu/intel.c |    7 -------
 lib/usercopy.c     |    7 +++++++
 2 files changed, 7 insertions(+), 7 deletions(-)


--- linux-2.6.0-test5/arch/i386/kernel/cpu/intel.c.old	2003-09-13 18:06:45.000000000 +0200
+++ linux-2.6.0-test5/arch/i386/kernel/cpu/intel.c	2003-09-13 18:08:00.000000000 +0200
@@ -13,13 +13,6 @@
 
 extern int trap_init_f00f_bug(void);
 
-#ifdef CONFIG_X86_INTEL_USERCOPY
-/*
- * Alignment at which movsl is preferred for bulk memory copies.
- */
-struct movsl_mask movsl_mask;
-#endif
-
 /*
  *	Early probe support logic for ppro memory erratum #50
  *
--- linux-2.6.0-test5/arch/i386/lib/usercopy.c.old	2003-09-13 18:06:56.000000000 +0200
+++ linux-2.6.0-test5/arch/i386/lib/usercopy.c	2003-09-13 18:07:51.000000000 +0200
@@ -12,6 +12,13 @@
 #include <asm/uaccess.h>
 #include <asm/mmx.h>
 
+#ifdef CONFIG_X86_INTEL_USERCOPY
+/*
+ * Alignment at which movsl is preferred for bulk memory copies.
+ */
+struct movsl_mask movsl_mask;
+#endif
+
 static inline int __movsl_is_ok(unsigned long a1, unsigned long a2, unsigned long n)
 {
 #ifdef CONFIG_X86_INTEL_USERCOPY