1 files changed, 10 insertions, 9 deletions

diff --git a/arch/x86/kernel/doublefault_32.c b/arch/x86/kernel/doublefault_32.c
index 40978af630e..a47798b59f0 100644
--- a/arch/x86/kernel/doublefault_32.c
+++ b/arch/x86/kernel/doublefault_32.c
@@ -17,7 +17,7 @@ static unsigned long doublefault_stack[DOUBLEFAULT_STACKSIZE];
 
 static void doublefault_fn(void)
 {
-        struct Xgt_desc_struct gdt_desc = {0, 0};
+        struct desc_ptr gdt_desc = {0, 0};
         unsigned long gdt, tss;
 
         store_gdt(&gdt_desc);
@@ -33,14 +33,15 @@ static void doublefault_fn(void)
                 printk(KERN_EMERG "double fault, tss at %08lx\n", tss);
 
                 if (ptr_ok(tss)) {
-                        struct i386_hw_tss *t = (struct i386_hw_tss *)tss;
+                        struct x86_hw_tss *t = (struct x86_hw_tss *)tss;
 
-                        printk(KERN_EMERG "eip = %08lx, esp = %08lx\n", t->eip, t->esp);
+                        printk(KERN_EMERG "eip = %08lx, esp = %08lx\n",
+                               t->ip, t->sp);
 
                         printk(KERN_EMERG "eax = %08lx, ebx = %08lx, ecx = %08lx, edx = %08lx\n",
-                                t->eax, t->ebx, t->ecx, t->edx);
+                                t->ax, t->bx, t->cx, t->dx);
                         printk(KERN_EMERG "esi = %08lx, edi = %08lx\n",
-                                t->esi, t->edi);
+                                t->si, t->di);
                 }
         }
 
@@ -50,15 +51,15 @@ static void doublefault_fn(void)
 
 struct tss_struct doublefault_tss __cacheline_aligned = {
         .x86_tss = {
-                .esp0           = STACK_START,
+                .sp0            = STACK_START,
                 .ss0            = __KERNEL_DS,
                 .ldt            = 0,
                 .io_bitmap_base = INVALID_IO_BITMAP_OFFSET,
 
-                .eip            = (unsigned long) doublefault_fn,
+                .ip             = (unsigned long) doublefault_fn,
                 /* 0x2 bit is always set */
-                .eflags         = X86_EFLAGS_SF | 0x2,
-                .esp            = STACK_START,
+                .flags          = X86_EFLAGS_SF | 0x2,
+                .sp             = STACK_START,
                 .es             = __USER_DS,
                 .cs             = __KERNEL_CS,
                 .ss             = __KERNEL_DS,