From: Jeremy Fitzhardinge Date: Thu, 10 Jul 2008 19:52:52 +0000 (-0700) Subject: x86: fix compile error in current tip.git X-Git-Tag: v2.6.27-rc1~1106^2~30 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=27cb0a75ba252ea7294d67232c4bbbac3f2b2656;p=linux-2.6-omap-h63xx.git x86: fix compile error in current tip.git Gas 2.15 complains about 32-bit registers being used in lea. AS arch/x86/lib/copy_user_64.o /local/scratch-2/jeremy/hg/xen/paravirt/linux/arch/x86/lib/copy_user_64.S: Assembler messages: /local/scratch-2/jeremy/hg/xen/paravirt/linux/arch/x86/lib/copy_user_64.S:188: Error: `(%edx,%ecx,8)' is not a valid 64 bit base/index expression /local/scratch-2/jeremy/hg/xen/paravirt/linux/arch/x86/lib/copy_user_64.S:257: Error: `(%edx,%ecx,8)' is not a valid 64 bit base/index expression AS arch/x86/lib/copy_user_nocache_64.o /local/scratch-2/jeremy/hg/xen/paravirt/linux/arch/x86/lib/copy_user_nocache_64.S: Assembler messages: /local/scratch-2/jeremy/hg/xen/paravirt/linux/arch/x86/lib/copy_user_nocache_64.S:107: Error: `(%edx,%ecx,8)' is not a valid 64 bit base/index expression Signed-off-by: Jeremy Fitzhardinge Cc: Vitaly Mayatskikh Signed-off-by: Ingo Molnar --- diff --git a/arch/x86/lib/copy_user_64.S b/arch/x86/lib/copy_user_64.S index e5afb4ad3f1..dfdf428975c 100644 --- a/arch/x86/lib/copy_user_64.S +++ b/arch/x86/lib/copy_user_64.S @@ -185,7 +185,7 @@ ENTRY(copy_user_generic_unrolled) 30: shll $6,%ecx addl %ecx,%edx jmp 60f -40: leal (%edx,%ecx,8),%edx +40: lea (%rdx,%rcx,8),%rdx jmp 60f 50: movl %ecx,%edx 60: jmp copy_user_handle_tail /* ecx is zerorest also */ @@ -254,7 +254,7 @@ ENTRY(copy_user_generic_string) ret .section .fixup,"ax" -11: leal (%edx,%ecx,8),%ecx +11: lea (%rdx,%rcx,8),%rcx 12: movl %ecx,%edx /* ecx is zerorest also */ jmp copy_user_handle_tail .previous diff --git a/arch/x86/lib/copy_user_nocache_64.S b/arch/x86/lib/copy_user_nocache_64.S index 93353d6a526..40e0e309d27 100644 --- a/arch/x86/lib/copy_user_nocache_64.S +++ b/arch/x86/lib/copy_user_nocache_64.S @@ -104,7 +104,7 @@ ENTRY(__copy_user_nocache) 30: shll $6,%ecx addl %ecx,%edx jmp 60f -40: leal (%edx,%ecx,8),%edx +40: lea (%rdx,%rcx,8),%rdx jmp 60f 50: movl %ecx,%edx 60: sfence