vserver 1.9.5.x5

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

diff --git a/include/asm-x86_64/acpi.h b/include/asm-x86_64/acpi.h
index 22a130b..c5c478a 100644 (file)
--- a/include/asm-x86_64/acpi.h
+++ b/include/asm-x86_64/acpi.h
@@ -99,6 +99,11 @@ __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
 
 #ifdef CONFIG_ACPI_BOOT
 extern int acpi_lapic;
@@ -126,6 +131,10 @@ extern int acpi_gsi_to_irq(u32 gsi, unsigned int *irq);
 #define acpi_ioapic 0
 #endif /* !CONFIG_ACPI_BOOT */
 
+extern int acpi_numa;
+extern int acpi_scan_nodes(unsigned long start, unsigned long end);
+#define NR_NODE_MEMBLKS (MAX_NUMNODES*2)
+
 #ifdef CONFIG_ACPI_PCI
 static inline void acpi_noirq_set(void) { acpi_noirq = 1; }
 static inline void acpi_disable_pci(void) 
@@ -159,6 +168,10 @@ extern void acpi_reserve_bootmem(void);
 extern int acpi_disabled;
 extern int acpi_pci_disabled;
 
+extern u8 x86_acpiid_to_apicid[];
+
+extern int acpi_skip_timer_override;
+
 #endif /*__KERNEL__*/
 
 #endif /*_ASM_ACPI_H*/