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
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
include
/
asm-i386
/
acpi.h
diff --git
a/include/asm-i386/acpi.h
b/include/asm-i386/acpi.h
index
42164a6
..
55059ab
100644
(file)
--- a/
include/asm-i386/acpi.h
+++ b/
include/asm-i386/acpi.h
@@
-28,6
+28,8
@@
#ifdef __KERNEL__
#ifdef __KERNEL__
+#include <acpi/pdc_intel.h>
+
#include <asm/system.h> /* defines cmpxchg */
#define COMPILER_DEPENDENT_INT64 long long
#include <asm/system.h> /* defines cmpxchg */
#define COMPILER_DEPENDENT_INT64 long long
@@
-101,8
+103,7
@@
__acpi_release_global_lock (unsigned int *lock)
:"=r"(n_hi), "=r"(n_lo) \
:"0"(n_hi), "1"(n_lo))
:"=r"(n_hi), "=r"(n_lo) \
:"0"(n_hi), "1"(n_lo))
-
-#ifdef CONFIG_ACPI_BOOT
+#ifdef CONFIG_ACPI
extern int acpi_lapic;
extern int acpi_ioapic;
extern int acpi_noirq;
extern int acpi_lapic;
extern int acpi_ioapic;
extern int acpi_noirq;
@@
-122,12
+123,13
@@
static inline void disable_acpi(void)
#define FIX_ACPI_PAGES 4
extern int acpi_gsi_to_irq(u32 gsi, unsigned int *irq);
#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_skip_timer_override;
#ifdef CONFIG_X86_IO_APIC
extern int skip_ioapic_setup;
extern int acpi_skip_timer_override;
+extern void check_acpi_pci(void);
+
static inline void disable_ioapic_setup(void)
{
skip_ioapic_setup = 1;
static inline void disable_ioapic_setup(void)
{
skip_ioapic_setup = 1;
@@
-139,18
+141,11
@@
static inline int ioapic_setup_disabled(void)
}
#else
}
#else
-static inline void disable_ioapic_setup(void)
-{ }
+static inline void disable_ioapic_setup(void)
{ }
+
static inline void check_acpi_pci(void)
{ }
#endif
#endif
-#else /* CONFIG_ACPI_BOOT */
-# define acpi_lapic 0
-# define acpi_ioapic 0
-
-#endif
-
-#ifdef CONFIG_ACPI_PCI
static inline void acpi_noirq_set(void) { acpi_noirq = 1; }
static inline void acpi_disable_pci(void)
{
static inline void acpi_noirq_set(void) { acpi_noirq = 1; }
static inline void acpi_disable_pci(void)
{
@@
-158,17
+153,21
@@
static inline void acpi_disable_pci(void)
acpi_noirq_set();
}
extern int acpi_irq_balance_set(char *str);
acpi_noirq_set();
}
extern int acpi_irq_balance_set(char *str);
-#else
+
+#else /* !CONFIG_ACPI */
+
+#define acpi_lapic 0
+#define acpi_ioapic 0
static inline void acpi_noirq_set(void) { }
static inline void acpi_disable_pci(void) { }
static inline void acpi_noirq_set(void) { }
static inline void acpi_disable_pci(void) { }
-static inline int acpi_irq_balance_set(char *str) { return 0; }
-#endif
+
+#endif /* !CONFIG_ACPI */
+
#ifdef CONFIG_ACPI_SLEEP
/* routines for saving/restoring kernel state */
extern int acpi_save_state_mem(void);
#ifdef CONFIG_ACPI_SLEEP
/* 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;
@@
-178,6
+177,10
@@
extern void acpi_reserve_bootmem(void);
#endif /*CONFIG_ACPI_SLEEP*/
#endif /*CONFIG_ACPI_SLEEP*/
+extern u8 x86_acpiid_to_apicid[];
+
+#define ARCH_HAS_POWER_INIT 1
+
#endif /*__KERNEL__*/
#endif /*_ASM_ACPI_H*/
#endif /*__KERNEL__*/
#endif /*_ASM_ACPI_H*/