Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6

[linux-2.6] / include / asm-x86 / lguest.h

diff --git a/include/asm-x86/lguest.h b/include/asm-x86/lguest.h
index 3585a1628b592a25bf0ce5a4aaf9fb5117428ccb..4d9367b72976a1601897af8ce3f448ad58245c11 100644 (file)
--- a/include/asm-x86/lguest.h
+++ b/include/asm-x86/lguest.h
@@ -51,12 +51,12 @@ struct lguest_ro_state
        /* Fields which are used when guest is running. */
        struct desc_ptr guest_idt_desc;
        struct desc_ptr guest_gdt_desc;
-       struct i386_hw_tss guest_tss;
+       struct x86_hw_tss guest_tss;
        struct desc_struct guest_idt[IDT_ENTRIES];
        struct desc_struct guest_gdt[GDT_ENTRIES];
 };
 
-struct lguest_arch
+struct lg_cpu_arch
 {
        /* The GDT entries copied into lguest_ro_state when running. */
        struct desc_struct gdt[GDT_ENTRIES];