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

diff --git a/arch/x86/kernel/irq_64.c b/arch/x86/kernel/irq_64.c
index 6c3a3b6e5cf4..3aac15466a91 100644
--- a/arch/x86/kernel/irq_64.c
+++ b/arch/x86/kernel/irq_64.c
@@ -53,11 +53,11 @@ static inline void stack_overflow_check(struct pt_regs *regs)
         u64 curbase = (u64)task_stack_page(current);
         static unsigned long warned = -60*HZ;
 
-        if (regs->rsp >= curbase && regs->rsp <= curbase + THREAD_SIZE &&
-            regs->rsp <  curbase + sizeof(struct thread_info) + 128 &&
+        if (regs->sp >= curbase && regs->sp <= curbase + THREAD_SIZE &&
+            regs->sp <  curbase + sizeof(struct thread_info) + 128 &&
             time_after(jiffies, warned + 60*HZ)) {
-                printk("do_IRQ: %s near stack overflow (cur:%Lx,rsp:%lx)\n",
-                       current->comm, curbase, regs->rsp);
+                printk("do_IRQ: %s near stack overflow (cur:%Lx,sp:%lx)\n",
+                       current->comm, curbase, regs->sp);
                 show_stack(NULL,NULL);
                 warned = jiffies;
         }
@@ -162,7 +162,7 @@ asmlinkage unsigned int do_IRQ(struct pt_regs *regs)
         struct pt_regs *old_regs = set_irq_regs(regs);
 
         /* high bit used in ret_from_ code  */
-        unsigned vector = ~regs->orig_rax;
+        unsigned vector = ~regs->orig_ax;
         unsigned irq;
 
         exit_idle();