aboutsummaryrefslogtreecommitdiff
path: root/arch/x86/include/asm
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-12-23 16:24:15 +0100
committerIngo Molnar <mingo@elte.hu>2008-12-23 16:24:15 +0100
commitbf8bd66d0580f296f257d371ee41a0a137b541c7 (patch)
tree4c7f7471005b4436d40ba52edd51214d12331f25 /arch/x86/include/asm
parent8ae936690972dfcad73d0dde1095b9f32af5ee95 (diff)
parent1ccedb7cdba6886939dd8b4c8f965a826f696e56 (diff)
Merge branch 'x86/apic' into x86/irq
Conflicts: arch/x86/kernel/apic.c
Diffstat (limited to 'arch/x86/include/asm')
-rw-r--r--arch/x86/include/asm/vmi.h8
1 files changed, 7 insertions, 1 deletions
diff --git a/arch/x86/include/asm/vmi.h b/arch/x86/include/asm/vmi.h
index b7c0dea119f..61e08c0a290 100644
--- a/arch/x86/include/asm/vmi.h
+++ b/arch/x86/include/asm/vmi.h
@@ -223,9 +223,15 @@ struct pci_header {
} __attribute__((packed));
/* Function prototypes for bootstrapping */
+#ifdef CONFIG_VMI
extern void vmi_init(void);
+extern void vmi_activate(void);
extern void vmi_bringup(void);
-extern void vmi_apply_boot_page_allocations(void);
+#else
+static inline void vmi_init(void) {}
+static inline void vmi_activate(void) {}
+static inline void vmi_bringup(void) {}
+#endif
/* State needed to start an application processor in an SMP system. */
struct vmi_ap_state {