x86 vDSO: harmonize asm-offsets

This change harmonizes the asm-offsets macros used in the 32-bit vDSO
across 32-bit and 64-bit builds.  It's a purely cosmetic change for now,
but it paves the way for consolidating the 32-bit vDSO builds.

Signed-off-by: Roland McGrath <roland@redhat.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

1 files changed, 10 insertions, 10 deletions

diff --git a/arch/x86/kernel/asm-offsets_32.c b/arch/x86/kernel/asm-offsets_32.c
index c1ccfabb4a9e..4f750ec810f6 100644
--- a/arch/x86/kernel/asm-offsets_32.c
+++ b/arch/x86/kernel/asm-offsets_32.c
@@ -38,15 +38,15 @@ void foo(void);
 
 void foo(void)
 {
-        OFFSET(SIGCONTEXT_eax, sigcontext, eax);
-        OFFSET(SIGCONTEXT_ebx, sigcontext, ebx);
-        OFFSET(SIGCONTEXT_ecx, sigcontext, ecx);
-        OFFSET(SIGCONTEXT_edx, sigcontext, edx);
-        OFFSET(SIGCONTEXT_esi, sigcontext, esi);
-        OFFSET(SIGCONTEXT_edi, sigcontext, edi);
-        OFFSET(SIGCONTEXT_ebp, sigcontext, ebp);
-        OFFSET(SIGCONTEXT_esp, sigcontext, esp);
-        OFFSET(SIGCONTEXT_eip, sigcontext, eip);
+        OFFSET(IA32_SIGCONTEXT_eax, sigcontext, eax);
+        OFFSET(IA32_SIGCONTEXT_ebx, sigcontext, ebx);
+        OFFSET(IA32_SIGCONTEXT_ecx, sigcontext, ecx);
+        OFFSET(IA32_SIGCONTEXT_edx, sigcontext, edx);
+        OFFSET(IA32_SIGCONTEXT_esi, sigcontext, esi);
+        OFFSET(IA32_SIGCONTEXT_edi, sigcontext, edi);
+        OFFSET(IA32_SIGCONTEXT_ebp, sigcontext, ebp);
+        OFFSET(IA32_SIGCONTEXT_esp, sigcontext, esp);
+        OFFSET(IA32_SIGCONTEXT_eip, sigcontext, eip);
         BLANK();
 
         OFFSET(CPUINFO_x86, cpuinfo_x86, x86);
@@ -94,7 +94,7 @@ void foo(void)
         BLANK();
 
         OFFSET(EXEC_DOMAIN_handler, exec_domain, handler);
-        OFFSET(RT_SIGFRAME_sigcontext, rt_sigframe, uc.uc_mcontext);
+        OFFSET(IA32_RT_SIGFRAME_sigcontext, rt_sigframe, uc.uc_mcontext);
         BLANK();
 
         OFFSET(pbe_address, pbe, address);