ia64/xen-unstable

changeset 8873:50b1fe78e2e8

find changesets by author, revision, files, or words in the commit message
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@xensource.com>
author kaf24@firebug.cl.cam.ac.uk
date Thu Feb 16 22:25:54 2006 +0100 (2006-02-16)
parents 40d7eef7d3f5
children 761275bcf825
files xen/include/asm-x86/mpspec.h
line diff
     1.1 --- a/xen/include/asm-x86/mpspec.h	Thu Feb 16 19:04:33 2006 +0100
     1.2 +++ b/xen/include/asm-x86/mpspec.h	Thu Feb 16 22:25:54 2006 +0100
     1.3 @@ -23,19 +23,18 @@ extern int mp_irq_entries;
     1.4  extern struct mpc_config_intsrc mp_irqs [MAX_IRQ_SOURCES];
     1.5  extern int mpc_default_type;
     1.6  extern int mp_bus_id_to_pci_bus [MAX_MP_BUSSES];
     1.7 -extern int mp_current_pci_id;
     1.8  extern unsigned long mp_lapic_addr;
     1.9  extern int pic_mode;
    1.10  extern int using_apic_timer;
    1.11  
    1.12 -#ifdef CONFIG_ACPI_BOOT
    1.13 +#ifdef CONFIG_ACPI
    1.14  extern void mp_register_lapic (u8 id, u8 enabled);
    1.15  extern void mp_register_lapic_address (u64 address);
    1.16  extern void mp_register_ioapic (u8 id, u32 address, u32 gsi_base);
    1.17  extern void mp_override_legacy_irq (u8 bus_irq, u8 polarity, u8 trigger, u32 gsi);
    1.18  extern void mp_config_acpi_legacy_irqs (void);
    1.19  extern int mp_register_gsi (u32 gsi, int edge_level, int active_high_low);
    1.20 -#endif /*CONFIG_ACPI_BOOT*/
    1.21 +#endif /* CONFIG_ACPI */
    1.22  
    1.23  #define PHYSID_ARRAY_SIZE	BITS_TO_LONGS(MAX_APICS)
    1.24