Merge commit '63cc8c75156462d4b42cbdd76c293b7eee7ddbfe':

[pandora-kernel.git] / arch / x86 / kernel / doublefault_32.c

diff --git a/arch/x86/kernel/doublefault_32.c b/arch/x86/kernel/doublefault_32.c
index cc19a3e..a47798b 100644 (file)
--- 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,7 +33,7 @@ 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->ip, t->sp);