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

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

diff --git a/include/asm-x86/lguest.h b/include/asm-x86/lguest.h
index 1c8367a692f67f106af26352e0d64650fc24f8a1..9b17571e9bc35f3aaf68c4eb451ae4fa384578d7 100644 (file)
--- a/include/asm-x86/lguest.h
+++ b/include/asm-x86/lguest.h
@@ -23,6 +23,17 @@
 /* Found in switcher.S */
 extern unsigned long default_idt_entries[];
 
+/* Declarations for definitions in lguest_guest.S */
+extern char lguest_noirq_start[], lguest_noirq_end[];
+extern const char lgstart_cli[], lgend_cli[];
+extern const char lgstart_sti[], lgend_sti[];
+extern const char lgstart_popf[], lgend_popf[];
+extern const char lgstart_pushf[], lgend_pushf[];
+extern const char lgstart_iret[], lgend_iret[];
+
+extern void lguest_iret(void);
+extern void lguest_init(void);
+
 struct lguest_regs
 {
        /* Manually saved part. */
@@ -56,7 +67,7 @@ struct lguest_ro_state
        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];