Commit 7db681d7 authored by Vivek Goyal's avatar Vivek Goyal Committed by Andi Kleen

[PATCH] x86-64: wakeup.S rename registers to reflect right names

o Use appropriate names for 64bit regsiters.
Signed-off-by: default avatarEric W. Biederman <ebiederm@xmission.com>
Signed-off-by: default avatarVivek Goyal <vgoyal@in.ibm.com>
Signed-off-by: default avatarAndi Kleen <ak@suse.de>
parent 7c17e706
...@@ -211,16 +211,16 @@ wakeup_long64: ...@@ -211,16 +211,16 @@ wakeup_long64:
movw %ax, %es movw %ax, %es
movw %ax, %fs movw %ax, %fs
movw %ax, %gs movw %ax, %gs
movq saved_esp, %rsp movq saved_rsp, %rsp
movw $0x0e00 + 'x', %ds:(0xb8018) movw $0x0e00 + 'x', %ds:(0xb8018)
movq saved_ebx, %rbx movq saved_rbx, %rbx
movq saved_edi, %rdi movq saved_rdi, %rdi
movq saved_esi, %rsi movq saved_rsi, %rsi
movq saved_ebp, %rbp movq saved_rbp, %rbp
movw $0x0e00 + '!', %ds:(0xb801a) movw $0x0e00 + '!', %ds:(0xb801a)
movq saved_eip, %rax movq saved_rip, %rax
jmp *%rax jmp *%rax
.code32 .code32
...@@ -408,13 +408,13 @@ do_suspend_lowlevel: ...@@ -408,13 +408,13 @@ do_suspend_lowlevel:
movq %r15, saved_context_r15(%rip) movq %r15, saved_context_r15(%rip)
pushfq ; popq saved_context_eflags(%rip) pushfq ; popq saved_context_eflags(%rip)
movq $.L97, saved_eip(%rip) movq $.L97, saved_rip(%rip)
movq %rsp,saved_esp movq %rsp,saved_rsp
movq %rbp,saved_ebp movq %rbp,saved_rbp
movq %rbx,saved_ebx movq %rbx,saved_rbx
movq %rdi,saved_edi movq %rdi,saved_rdi
movq %rsi,saved_esi movq %rsi,saved_rsi
addq $8, %rsp addq $8, %rsp
movl $3, %edi movl $3, %edi
...@@ -461,12 +461,12 @@ do_suspend_lowlevel: ...@@ -461,12 +461,12 @@ do_suspend_lowlevel:
.data .data
ALIGN ALIGN
ENTRY(saved_ebp) .quad 0 ENTRY(saved_rbp) .quad 0
ENTRY(saved_esi) .quad 0 ENTRY(saved_rsi) .quad 0
ENTRY(saved_edi) .quad 0 ENTRY(saved_rdi) .quad 0
ENTRY(saved_ebx) .quad 0 ENTRY(saved_rbx) .quad 0
ENTRY(saved_eip) .quad 0 ENTRY(saved_rip) .quad 0
ENTRY(saved_esp) .quad 0 ENTRY(saved_rsp) .quad 0
ENTRY(saved_magic) .quad 0 ENTRY(saved_magic) .quad 0
...@@ -45,12 +45,12 @@ extern unsigned long saved_context_eflags; ...@@ -45,12 +45,12 @@ extern unsigned long saved_context_eflags;
extern void fix_processor_context(void); extern void fix_processor_context(void);
#ifdef CONFIG_ACPI_SLEEP #ifdef CONFIG_ACPI_SLEEP
extern unsigned long saved_eip; extern unsigned long saved_rip;
extern unsigned long saved_esp; extern unsigned long saved_rsp;
extern unsigned long saved_ebp; extern unsigned long saved_rbp;
extern unsigned long saved_ebx; extern unsigned long saved_rbx;
extern unsigned long saved_esi; extern unsigned long saved_rsi;
extern unsigned long saved_edi; extern unsigned long saved_rdi;
/* routines for saving/restoring kernel state */ /* routines for saving/restoring kernel state */
extern int acpi_save_state_mem(void); extern int acpi_save_state_mem(void);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment