1 files changed, 31 insertions, 34 deletions

diff --git a/arch/x86/kernel/asm-offsets_32.c b/arch/x86/kernel/asm-offsets_32.c
index 0e45981b2dd7..afd84463b712 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_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);
@@ -70,39 +70,38 @@ void foo(void)
         OFFSET(TI_cpu, thread_info, cpu);
         BLANK();
 
-        OFFSET(GDS_size, Xgt_desc_struct, size);
-        OFFSET(GDS_address, Xgt_desc_struct, address);
-        OFFSET(GDS_pad, Xgt_desc_struct, pad);
+        OFFSET(GDS_size, desc_ptr, size);
+        OFFSET(GDS_address, desc_ptr, address);
         BLANK();
 
-        OFFSET(PT_EBX, pt_regs, ebx);
-        OFFSET(PT_ECX, pt_regs, ecx);
-        OFFSET(PT_EDX, pt_regs, edx);
-        OFFSET(PT_ESI, pt_regs, esi);
-        OFFSET(PT_EDI, pt_regs, edi);
-        OFFSET(PT_EBP, pt_regs, ebp);
-        OFFSET(PT_EAX, pt_regs, eax);
-        OFFSET(PT_DS,  pt_regs, xds);
-        OFFSET(PT_ES,  pt_regs, xes);
-        OFFSET(PT_FS,  pt_regs, xfs);
-        OFFSET(PT_ORIG_EAX, pt_regs, orig_eax);
-        OFFSET(PT_EIP, pt_regs, eip);
-        OFFSET(PT_CS,  pt_regs, xcs);
-        OFFSET(PT_EFLAGS, pt_regs, eflags);
-        OFFSET(PT_OLDESP, pt_regs, esp);
-        OFFSET(PT_OLDSS,  pt_regs, xss);
+        OFFSET(PT_EBX, pt_regs, bx);
+        OFFSET(PT_ECX, pt_regs, cx);
+        OFFSET(PT_EDX, pt_regs, dx);
+        OFFSET(PT_ESI, pt_regs, si);
+        OFFSET(PT_EDI, pt_regs, di);
+        OFFSET(PT_EBP, pt_regs, bp);
+        OFFSET(PT_EAX, pt_regs, ax);
+        OFFSET(PT_DS,  pt_regs, ds);
+        OFFSET(PT_ES,  pt_regs, es);
+        OFFSET(PT_FS,  pt_regs, fs);
+        OFFSET(PT_ORIG_EAX, pt_regs, orig_ax);
+        OFFSET(PT_EIP, pt_regs, ip);
+        OFFSET(PT_CS,  pt_regs, cs);
+        OFFSET(PT_EFLAGS, pt_regs, flags);
+        OFFSET(PT_OLDESP, pt_regs, sp);
+        OFFSET(PT_OLDSS,  pt_regs, ss);
         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);
         OFFSET(pbe_orig_address, pbe, orig_address);
         OFFSET(pbe_next, pbe, next);
 
-        /* Offset from the sysenter stack to tss.esp0 */
-        DEFINE(TSS_sysenter_esp0, offsetof(struct tss_struct, x86_tss.esp0) -
+        /* Offset from the sysenter stack to tss.sp0 */
+        DEFINE(TSS_sysenter_sp0, offsetof(struct tss_struct, x86_tss.sp0) -
                  sizeof(struct tss_struct));
 
         DEFINE(PAGE_SIZE_asm, PAGE_SIZE);
@@ -111,8 +110,6 @@ void foo(void)
         DEFINE(PTRS_PER_PMD, PTRS_PER_PMD);
         DEFINE(PTRS_PER_PGD, PTRS_PER_PGD);
 
-        DEFINE(VDSO_PRELINK_asm, VDSO_PRELINK);
-
         OFFSET(crypto_tfm_ctx_offset, crypto_tfm, __crt_ctx);
 
 #ifdef CONFIG_PARAVIRT
@@ -123,7 +120,7 @@ void foo(void)
         OFFSET(PV_IRQ_irq_disable, pv_irq_ops, irq_disable);
         OFFSET(PV_IRQ_irq_enable, pv_irq_ops, irq_enable);
         OFFSET(PV_CPU_iret, pv_cpu_ops, iret);
-        OFFSET(PV_CPU_irq_enable_sysexit, pv_cpu_ops, irq_enable_sysexit);
+        OFFSET(PV_CPU_irq_enable_syscall_ret, pv_cpu_ops, irq_enable_syscall_ret);
         OFFSET(PV_CPU_read_cr0, pv_cpu_ops, read_cr0);
 #endif