git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 2.0 rc7
[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
015faa0
..
a6b41b8
100644
(file)
--- a/
include/asm-x86_64/acpi.h
+++ b/
include/asm-x86_64/acpi.h
@@
-131,6
+131,10
@@
extern int acpi_gsi_to_irq(u32 gsi, unsigned int *irq);
#define acpi_ioapic 0
#endif /* !CONFIG_ACPI_BOOT */
#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)
#ifdef CONFIG_ACPI_PCI
static inline void acpi_noirq_set(void) { acpi_noirq = 1; }
static inline void acpi_disable_pci(void)
@@
-149,7
+153,6
@@
static inline int acpi_irq_balance_set(char *str) { return 0; }
/* routines for saving/restoring kernel state */
extern int acpi_save_state_mem(void);
/* routines for saving/restoring kernel state */
extern int acpi_save_state_mem(void);
-extern int acpi_save_state_disk(void);
extern void acpi_restore_state_mem(void);
extern unsigned long acpi_wakeup_address;
extern void acpi_restore_state_mem(void);
extern unsigned long acpi_wakeup_address;
@@
-166,6
+169,8
@@
extern int acpi_pci_disabled;
extern u8 x86_acpiid_to_apicid[];
extern u8 x86_acpiid_to_apicid[];
+extern int acpi_skip_timer_override;
+
#endif /*__KERNEL__*/
#endif /*_ASM_ACPI_H*/
#endif /*__KERNEL__*/
#endif /*_ASM_ACPI_H*/