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

o Use appropriate names for 64bit regsiters.

Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Signed-off-by: Vivek Goyal <vgoyal@in.ibm.com>
Signed-off-by: Andi Kleen <ak@suse.de>

diff --git a/arch/x86_64/kernel/acpi/wakeup.S b/arch/x86_64/kernel/acpi/wakeup.S
index 6ece70e91a325bbdd8279f4a86a11f4a5e42b79f..17dbeff64eefb04edaf96346e365f51e410a36d6 100644 (file)
--- a/arch/x86_64/kernel/acpi/wakeup.S
+++ b/arch/x86_64/kernel/acpi/wakeup.S
@@ -211,16 +211,16 @@ wakeup_long64:
        movw    %ax, %es
        movw    %ax, %fs
        movw    %ax, %gs
-       movq    saved_esp, %rsp
+       movq    saved_rsp, %rsp
 
        movw    $0x0e00 + 'x', %ds:(0xb8018)
-       movq    saved_ebx, %rbx
-       movq    saved_edi, %rdi
-       movq    saved_esi, %rsi
-       movq    saved_ebp, %rbp
+       movq    saved_rbx, %rbx
+       movq    saved_rdi, %rdi
+       movq    saved_rsi, %rsi
+       movq    saved_rbp, %rbp
 
        movw    $0x0e00 + '!', %ds:(0xb801a)
-       movq    saved_eip, %rax
+       movq    saved_rip, %rax
        jmp     *%rax
 
 .code32
@@ -408,13 +408,13 @@ do_suspend_lowlevel:
        movq %r15, saved_context_r15(%rip)
        pushfq ; popq saved_context_eflags(%rip)
 
-       movq    $.L97, saved_eip(%rip)
+       movq    $.L97, saved_rip(%rip)
 
-       movq %rsp,saved_esp
-       movq %rbp,saved_ebp
-       movq %rbx,saved_ebx
-       movq %rdi,saved_edi
-       movq %rsi,saved_esi
+       movq %rsp,saved_rsp
+       movq %rbp,saved_rbp
+       movq %rbx,saved_rbx
+       movq %rdi,saved_rdi
+       movq %rsi,saved_rsi
 
        addq    $8, %rsp
        movl    $3, %edi
@@ -461,12 +461,12 @@ do_suspend_lowlevel:
        
 .data
 ALIGN
-ENTRY(saved_ebp)       .quad   0
-ENTRY(saved_esi)       .quad   0
-ENTRY(saved_edi)       .quad   0
-ENTRY(saved_ebx)       .quad   0
+ENTRY(saved_rbp)       .quad   0
+ENTRY(saved_rsi)       .quad   0
+ENTRY(saved_rdi)       .quad   0
+ENTRY(saved_rbx)       .quad   0
 
-ENTRY(saved_eip)       .quad   0
-ENTRY(saved_esp)       .quad   0
+ENTRY(saved_rip)       .quad   0
+ENTRY(saved_rsp)       .quad   0
 
 ENTRY(saved_magic)     .quad   0

diff --git a/include/asm-x86_64/suspend.h b/include/asm-x86_64/suspend.h
index a42306c220d6dcd74851850af0e6090d86eca592..9c3f8de90d2da9c10de87d5ed3b52dfb1acc2862 100644 (file)
--- a/include/asm-x86_64/suspend.h
+++ b/include/asm-x86_64/suspend.h
@@ -45,12 +45,12 @@ extern unsigned long saved_context_eflags;
 extern void fix_processor_context(void);
 
 #ifdef CONFIG_ACPI_SLEEP
-extern unsigned long saved_eip;
-extern unsigned long saved_esp;
-extern unsigned long saved_ebp;
-extern unsigned long saved_ebx;
-extern unsigned long saved_esi;
-extern unsigned long saved_edi;
+extern unsigned long saved_rip;
+extern unsigned long saved_rsp;
+extern unsigned long saved_rbp;
+extern unsigned long saved_rbx;
+extern unsigned long saved_rsi;
+extern unsigned long saved_rdi;
 
 /* routines for saving/restoring kernel state */
 extern int acpi_save_state_mem(void);