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

diff --git a/arch/x86/kernel/asm-offsets_64.c b/arch/x86/kernel/asm-offsets_64.c
index c27c646214f4..2e918ebf21d3 100644
--- a/arch/x86/kernel/asm-offsets_64.c
+++ b/arch/x86/kernel/asm-offsets_64.c
@@ -83,14 +83,14 @@ int main(void)
         DEFINE(pbe_next, offsetof(struct pbe, next));
         BLANK();
 #define ENTRY(entry) DEFINE(pt_regs_ ## entry, offsetof(struct pt_regs, entry))
-        ENTRY(rbx);
-        ENTRY(rbx);
-        ENTRY(rcx);
-        ENTRY(rdx);
-        ENTRY(rsp);
-        ENTRY(rbp);
-        ENTRY(rsi);
-        ENTRY(rdi);
+        ENTRY(bx);
+        ENTRY(bx);
+        ENTRY(cx);
+        ENTRY(dx);
+        ENTRY(sp);
+        ENTRY(bp);
+        ENTRY(si);
+        ENTRY(di);
         ENTRY(r8);
         ENTRY(r9);
         ENTRY(r10);
@@ -99,7 +99,7 @@ int main(void)
         ENTRY(r13);
         ENTRY(r14);
         ENTRY(r15);
-        ENTRY(eflags);
+        ENTRY(flags);
         BLANK();
 #undef ENTRY
 #define ENTRY(entry) DEFINE(saved_context_ ## entry, offsetof(struct saved_context, entry))