diff -urN linux-2.6.17-rc4-mm1.orig/arch/i386/lib/usercopy.c linux-2.6.17-rc4-mm1/arch/i386/lib/usercopy.c
--- linux-2.6.17-rc4-mm1.orig/arch/i386/lib/usercopy.c	2006-05-15 15:47:42.000000000 +0000
+++ linux-2.6.17-rc4-mm1/arch/i386/lib/usercopy.c	2006-05-15 19:25:29.638518750 +0000
@@ -15,7 +15,7 @@
 
 static inline int __movsl_is_ok(unsigned long a1, unsigned long a2, unsigned long n)
 {
-#ifdef CONFIG_X86_INTEL_USERCOPY
+#if defined(CONFIG_CPU_SUP_INTEL) && defined(CONFIG_X86_INTEL_USERCOPY)
 	if (n >= 64 && ((a1 ^ a2) & movsl_mask.mask))
 		return 0;
 #endif