[Xen-changelog] Sync Xen's mpspec.h with Linux 2.6.16-rc2 codebase.

[Xen patchbot -unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User kaf24@xxxxxxxxxxxxxxxxxxxx
# Node ID 50b1fe78e2e8068b1b4fbe128312b550790722f0
# Parent  40d7eef7d3f5e6e39b40ccb5ca34d8cbf871b30a
Sync Xen's mpspec.h with Linux 2.6.16-rc2 codebase.
Fixes building with gcc 4.1-pre, pointed out by Chris Wright.

Signed-off-by: Keir Fraser <keir@xxxxxxxxxxxxx>

diff -r 40d7eef7d3f5 -r 50b1fe78e2e8 xen/include/asm-x86/mpspec.h
--- a/xen/include/asm-x86/mpspec.h      Thu Feb 16 18:04:33 2006
+++ b/xen/include/asm-x86/mpspec.h      Thu Feb 16 21:25:54 2006
@@ -23,19 +23,18 @@
 extern struct mpc_config_intsrc mp_irqs [MAX_IRQ_SOURCES];
 extern int mpc_default_type;
 extern int mp_bus_id_to_pci_bus [MAX_MP_BUSSES];
-extern int mp_current_pci_id;
 extern unsigned long mp_lapic_addr;
 extern int pic_mode;
 extern int using_apic_timer;
 
-#ifdef CONFIG_ACPI_BOOT
+#ifdef CONFIG_ACPI
 extern void mp_register_lapic (u8 id, u8 enabled);
 extern void mp_register_lapic_address (u64 address);
 extern void mp_register_ioapic (u8 id, u32 address, u32 gsi_base);
 extern void mp_override_legacy_irq (u8 bus_irq, u8 polarity, u8 trigger, u32 
gsi);
 extern void mp_config_acpi_legacy_irqs (void);
 extern int mp_register_gsi (u32 gsi, int edge_level, int active_high_low);
-#endif /*CONFIG_ACPI_BOOT*/
+#endif /* CONFIG_ACPI */
 
 #define PHYSID_ARRAY_SIZE      BITS_TO_LONGS(MAX_APICS)
 

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog