diff options
| author |   Jeremy Fitzhardinge <jeremy@goop.org> | 2008-07-10 12:52:52 -0700 |
|---|---|---|
| committer |   Ingo Molnar <mingo@elte.hu> | 2008-07-10 21:55:59 +0200 |
| commit | 27cb0a75ba252ea7294d67232c4bbbac3f2b2656 (patch) | |
| tree | 3a72fbafa37e6222f3bdade4ca7bfdaaab300c35 /arch/x86/lib | |
| parent | x86: remove duplicate call to use_tsc_delay (diff) | |
| download | linux-dev-27cb0a75ba252ea7294d67232c4bbbac3f2b2656.tar.xz linux-dev-27cb0a75ba252ea7294d67232c4bbbac3f2b2656.zip | |
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 <jeremy.fitzhardinge@citrix.com>
Cc: Vitaly Mayatskikh <v.mayatskih@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/lib')
| -rw-r--r-- | arch/x86/lib/copy_user_64.S | 4 | ||||
| -rw-r--r-- | arch/x86/lib/copy_user_nocache_64.S | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/lib/copy_user_64.S b/arch/x86/lib/copy_user_64.S index e5afb4ad3f1c..dfdf428975c0 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 93353d6a5263..40e0e309d27e 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 |