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 1.9.5.x5
[linux-2.6.git]
/
include
/
asm-i386
/
acpi.h
diff --git
a/include/asm-i386/acpi.h
b/include/asm-i386/acpi.h
index
338c342
..
a4ab82c
100644
(file)
--- a/
include/asm-i386/acpi.h
+++ b/
include/asm-i386/acpi.h
@@
-101,12
+101,6
@@
__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))
-/*
- * 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
*/
/*
* Refer Intel ACPI _PDC support document for bit definitions
*/
@@
-133,12
+127,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;
@@
-150,8
+145,8
@@
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