vserver 1.9.3

[linux-2.6.git] / include / asm-i386 / acpi.h

diff --git a/include/asm-i386/acpi.h b/include/asm-i386/acpi.h
index 8bfd3c1..338c342 100644 (file)
--- a/include/asm-i386/acpi.h
+++ b/include/asm-i386/acpi.h
@@ -101,6 +101,17 @@ __acpi_release_global_lock (unsigned int *lock)
         :"=r"(n_hi), "=r"(n_lo)     \
         :"0"(n_hi), "1"(n_lo))
 
+/*
+ * Refer Intel ACPI _PDC support document for bit definitions
+ */
+#define ACPI_PDC_EST_CAPABILITY_SMP    0xa
+#define ACPI_PDC_EST_CAPABILITY_MSR    0x1
+
+/*
+ * Refer Intel ACPI _PDC support document for bit definitions
+ */
+#define ACPI_PDC_EST_CAPABILITY_SMP    0xa
+#define ACPI_PDC_EST_CAPABILITY_MSR    0x1
 
 #ifdef CONFIG_ACPI_BOOT 
 extern int acpi_lapic;
@@ -122,9 +133,10 @@ static inline void disable_acpi(void)
 #define FIX_ACPI_PAGES 4
 
 extern int acpi_gsi_to_irq(u32 gsi, unsigned int *irq);
+extern int (*platform_rename_gsi)(int ioapic, int gsi);
+
 #ifdef CONFIG_X86_IO_APIC
 extern int skip_ioapic_setup;
-extern int acpi_irq_to_vector(u32 irq);        /* deprecated in favor of acpi_gsi_to_irq */
 extern int acpi_skip_timer_override;
 
 static inline void disable_ioapic_setup(void)
@@ -177,6 +189,8 @@ extern void acpi_reserve_bootmem(void);
 
 #endif /*CONFIG_ACPI_SLEEP*/
 
+extern u8 x86_acpiid_to_apicid[];
+
 #endif /*__KERNEL__*/
 
 #endif /*_ASM_ACPI_H*/