---
 arch/i386/lib/usercopy.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: linux-2.6.17-rc3-no1/arch/i386/lib/usercopy.c
===================================================================
--- linux-2.6.17-rc3-no1.orig/arch/i386/lib/usercopy.c
+++ linux-2.6.17-rc3-no1/arch/i386/lib/usercopy.c
@@ -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