x86/asm: Merge common 32-bit values in asm-offsets.c

Merge common values for 32-bit native and compat.

Signed-off-by: Brian Gerst <brgerst@gmail.com>
Acked-by: Andy Lutomirski <luto@kernel.org>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Link: http://lkml.kernel.org/r/1428844486-6638-1-git-send-email-brgerst@gmail.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>

3 files changed, 19 insertions, 36 deletions

diff --git a/arch/x86/kernel/asm-offsets.c b/arch/x86/kernel/asm-offsets.c
index 9f6b9341950f..b27f6ec90caa 100644
--- a/arch/x86/kernel/asm-offsets.c
+++ b/arch/x86/kernel/asm-offsets.c
@@ -41,6 +41,25 @@ void common(void) {
         OFFSET(pbe_orig_address, pbe, orig_address);
         OFFSET(pbe_next, pbe, next);
 
+#if defined(CONFIG_X86_32) || defined(CONFIG_IA32_EMULATION)
+        BLANK();
+        OFFSET(IA32_SIGCONTEXT_ax, sigcontext_ia32, ax);
+        OFFSET(IA32_SIGCONTEXT_bx, sigcontext_ia32, bx);
+        OFFSET(IA32_SIGCONTEXT_cx, sigcontext_ia32, cx);
+        OFFSET(IA32_SIGCONTEXT_dx, sigcontext_ia32, dx);
+        OFFSET(IA32_SIGCONTEXT_si, sigcontext_ia32, si);
+        OFFSET(IA32_SIGCONTEXT_di, sigcontext_ia32, di);
+        OFFSET(IA32_SIGCONTEXT_bp, sigcontext_ia32, bp);
+        OFFSET(IA32_SIGCONTEXT_sp, sigcontext_ia32, sp);
+        OFFSET(IA32_SIGCONTEXT_ip, sigcontext_ia32, ip);
+
+        BLANK();
+        OFFSET(TI_sysenter_return, thread_info, sysenter_return);
+
+        BLANK();
+        OFFSET(IA32_RT_SIGFRAME_sigcontext, rt_sigframe_ia32, uc.uc_mcontext);
+#endif
+
 #ifdef CONFIG_PARAVIRT
         BLANK();
         OFFSET(PARAVIRT_enabled, pv_info, paravirt_enabled);
diff --git a/arch/x86/kernel/asm-offsets_32.c b/arch/x86/kernel/asm-offsets_32.c
index 47703aed74cf..628bfd4c06bb 100644
--- a/arch/x86/kernel/asm-offsets_32.c
+++ b/arch/x86/kernel/asm-offsets_32.c
@@ -17,17 +17,6 @@ void foo(void);
 
 void foo(void)
 {
-        OFFSET(IA32_SIGCONTEXT_ax, sigcontext, ax);
-        OFFSET(IA32_SIGCONTEXT_bx, sigcontext, bx);
-        OFFSET(IA32_SIGCONTEXT_cx, sigcontext, cx);
-        OFFSET(IA32_SIGCONTEXT_dx, sigcontext, dx);
-        OFFSET(IA32_SIGCONTEXT_si, sigcontext, si);
-        OFFSET(IA32_SIGCONTEXT_di, sigcontext, di);
-        OFFSET(IA32_SIGCONTEXT_bp, sigcontext, bp);
-        OFFSET(IA32_SIGCONTEXT_sp, sigcontext, sp);
-        OFFSET(IA32_SIGCONTEXT_ip, sigcontext, ip);
-        BLANK();
-
         OFFSET(CPUINFO_x86, cpuinfo_x86, x86);
         OFFSET(CPUINFO_x86_vendor, cpuinfo_x86, x86_vendor);
         OFFSET(CPUINFO_x86_model, cpuinfo_x86, x86_model);
@@ -37,7 +26,6 @@ void foo(void)
         OFFSET(CPUINFO_x86_vendor_id, cpuinfo_x86, x86_vendor_id);
         BLANK();
 
-        OFFSET(TI_sysenter_return, thread_info, sysenter_return);
         OFFSET(TI_cpu, thread_info, cpu);
         BLANK();
 
@@ -60,9 +48,6 @@ void foo(void)
         OFFSET(PT_OLDSS,  pt_regs, ss);
         BLANK();
 
-        OFFSET(IA32_RT_SIGFRAME_sigcontext, rt_sigframe, uc.uc_mcontext);
-        BLANK();
-
         OFFSET(saved_context_gdt_desc, saved_context, gdt_desc);
         BLANK();
 
diff --git a/arch/x86/kernel/asm-offsets_64.c b/arch/x86/kernel/asm-offsets_64.c
index 5ce6f2da8763..dcaab87da629 100644
--- a/arch/x86/kernel/asm-offsets_64.c
+++ b/arch/x86/kernel/asm-offsets_64.c
@@ -29,27 +29,6 @@ int main(void)
         BLANK();
 #endif
 
-#ifdef CONFIG_IA32_EMULATION
-        OFFSET(TI_sysenter_return, thread_info, sysenter_return);
-        BLANK();
-
-#define ENTRY(entry) OFFSET(IA32_SIGCONTEXT_ ## entry, sigcontext_ia32, entry)
-        ENTRY(ax);
-        ENTRY(bx);
-        ENTRY(cx);
-        ENTRY(dx);
-        ENTRY(si);
-        ENTRY(di);
-        ENTRY(bp);
-        ENTRY(sp);
-        ENTRY(ip);
-        BLANK();
-#undef ENTRY
-
-        OFFSET(IA32_RT_SIGFRAME_sigcontext, rt_sigframe_ia32, uc.uc_mcontext);
-        BLANK();
-#endif
-
 #define ENTRY(entry) OFFSET(pt_regs_ ## entry, pt_regs, entry)
         ENTRY(bx);
         ENTRY(cx);