VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)

[linux-2.6.git] / include / asm-x86_64 / mpspec.h

diff --git a/include/asm-x86_64/mpspec.h b/include/asm-x86_64/mpspec.h
index cbe6058..2768b7c 100644 (file)
--- a/include/asm-x86_64/mpspec.h
+++ b/include/asm-x86_64/mpspec.h
@@ -166,7 +166,7 @@ enum mp_bustype {
 };
 extern unsigned char mp_bus_id_to_type [MAX_MP_BUSSES];
 extern int mp_bus_id_to_pci_bus [MAX_MP_BUSSES];
-extern cpumask_t mp_bus_to_cpumask [MAX_MP_BUSSES];
+extern cpumask_t pci_bus_to_cpumask [256];
 
 extern unsigned int boot_cpu_physical_apicid;
 extern int smp_found_config;
@@ -189,7 +189,7 @@ 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 void mp_parse_prt (void);
+extern void mp_register_gsi (u32 gsi, int edge_level, int active_high_low);
 #endif /*CONFIG_X86_IO_APIC*/
 #endif
 
@@ -212,7 +212,7 @@ typedef struct physid_mask physid_mask_t;
 #define physids_and(dst, src1, src2)           bitmap_and((dst).mask, (src1).mask, (src2).mask, MAX_APICS)
 #define physids_or(dst, src1, src2)            bitmap_or((dst).mask, (src1).mask, (src2).mask, MAX_APICS)
 #define physids_clear(map)                     bitmap_zero((map).mask, MAX_APICS)
-#define physids_complement(map)                        bitmap_complement((map).mask, MAX_APICS)
+#define physids_complement(dst, src)           bitmap_complement((dst).mask, (src).mask, MAX_APICS)
 #define physids_empty(map)                     bitmap_empty((map).mask, MAX_APICS)
 #define physids_equal(map1, map2)              bitmap_equal((map1).mask, (map2).mask, MAX_APICS)
 #define physids_weight(map)                    bitmap_weight((map).mask, MAX_APICS)