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, 4 insertions, 4 deletions

diff --git a/arch/x86/kernel/time_32.c b/arch/x86/kernel/time_32.c
index 2dcbb81b4cd3..1a89e93f3f1c 100644
--- a/arch/x86/kernel/time_32.c
+++ b/arch/x86/kernel/time_32.c
@@ -49,15 +49,15 @@ unsigned long profile_pc(struct pt_regs *regs)
         unsigned long pc = instruction_pointer(regs);
 
 #ifdef CONFIG_SMP
-        if (!v8086_mode(regs) && SEGMENT_IS_KERNEL_CODE(regs->xcs) &&
+        if (!v8086_mode(regs) && SEGMENT_IS_KERNEL_CODE(regs->cs) &&
             in_lock_functions(pc)) {
 #ifdef CONFIG_FRAME_POINTER
-                return *(unsigned long *)(regs->ebp + 4);
+                return *(unsigned long *)(regs->bp + 4);
 #else
-                unsigned long *sp = (unsigned long *)&regs->esp;
+                unsigned long *sp = (unsigned long *)&regs->sp;
 
                 /* Return address is either directly at stack pointer
-                   or above a saved eflags. Eflags has bits 22-31 zero,
+                   or above a saved flags. Eflags has bits 22-31 zero,
                    kernel addresses don't. */
                 if (sp[0] >> 22)
                         return sp[0];