x86: rename the struct pt_regs members for 32/64-bit consistency

We have a lot of code which differs only by the naming of specific
members of structures that contain registers.  In order to enable
additional unifications, this patch drops the e- or r- size prefix
from the register names in struct pt_regs, and drops the x- prefixes
for segment registers on the 32-bit side.

This patch also performs the equivalent renames in some additional
places that might be candidates for unification in the future.

Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

1 files changed, 16 insertions, 16 deletions

diff --git a/arch/x86/kernel/acpi/wakeup_64.S b/arch/x86/kernel/acpi/wakeup_64.S
index 5ed3bc5c61d7..2e1b9e0d0767 100644
--- a/arch/x86/kernel/acpi/wakeup_64.S
+++ b/arch/x86/kernel/acpi/wakeup_64.S
@@ -344,13 +344,13 @@ do_suspend_lowlevel:
         call    save_processor_state
 
         movq    $saved_context, %rax
-        movq    %rsp, pt_regs_rsp(%rax)
-        movq    %rbp, pt_regs_rbp(%rax)
-        movq    %rsi, pt_regs_rsi(%rax)
-        movq    %rdi, pt_regs_rdi(%rax)
-        movq    %rbx, pt_regs_rbx(%rax)
-        movq    %rcx, pt_regs_rcx(%rax)
-        movq    %rdx, pt_regs_rdx(%rax)
+        movq    %rsp, pt_regs_sp(%rax)
+        movq    %rbp, pt_regs_bp(%rax)
+        movq    %rsi, pt_regs_si(%rax)
+        movq    %rdi, pt_regs_di(%rax)
+        movq    %rbx, pt_regs_bx(%rax)
+        movq    %rcx, pt_regs_cx(%rax)
+        movq    %rdx, pt_regs_dx(%rax)
         movq    %r8, pt_regs_r8(%rax)
         movq    %r9, pt_regs_r9(%rax)
         movq    %r10, pt_regs_r10(%rax)
@@ -360,7 +360,7 @@ do_suspend_lowlevel:
         movq    %r14, pt_regs_r14(%rax)
         movq    %r15, pt_regs_r15(%rax)
         pushfq
-        popq    pt_regs_eflags(%rax)
+        popq    pt_regs_flags(%rax)
 
         movq    $.L97, saved_rip(%rip)
 
@@ -391,15 +391,15 @@ do_suspend_lowlevel:
         movq    %rbx, %cr2
         movq    saved_context_cr0(%rax), %rbx
         movq    %rbx, %cr0
-        pushq   pt_regs_eflags(%rax)
+        pushq   pt_regs_flags(%rax)
         popfq
-        movq    pt_regs_rsp(%rax), %rsp
-        movq    pt_regs_rbp(%rax), %rbp
-        movq    pt_regs_rsi(%rax), %rsi
-        movq    pt_regs_rdi(%rax), %rdi
-        movq    pt_regs_rbx(%rax), %rbx
-        movq    pt_regs_rcx(%rax), %rcx
-        movq    pt_regs_rdx(%rax), %rdx
+        movq    pt_regs_sp(%rax), %rsp
+        movq    pt_regs_bp(%rax), %rbp
+        movq    pt_regs_si(%rax), %rsi
+        movq    pt_regs_di(%rax), %rdi
+        movq    pt_regs_bx(%rax), %rbx
+        movq    pt_regs_cx(%rax), %rcx
+        movq    pt_regs_dx(%rax), %rdx
         movq    pt_regs_r8(%rax), %r8
         movq    pt_regs_r9(%rax), %r9
         movq    pt_regs_r10(%rax), %r10