Commit 152475cb authored by Herbert Poetzl's avatar Herbert Poetzl Committed by Linus Torvalds

[PATCH] don't call check_acpi_pci() on x86 with ACPI disabled

check_acpi_pci() is called from arch/i386/kernel/setup.c even if
CONFIG_ACPI is not defined, but the code in include/asm/acpi.h doesn't
provide it in this case.
Signed-off-by: default avatarHerbert Pötzl <herbert@13thfloor.at>
Cc: "Brown, Len" <len.brown@intel.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 9430d58e
...@@ -103,6 +103,12 @@ __acpi_release_global_lock (unsigned int *lock) ...@@ -103,6 +103,12 @@ __acpi_release_global_lock (unsigned int *lock)
:"=r"(n_hi), "=r"(n_lo) \ :"=r"(n_hi), "=r"(n_lo) \
:"0"(n_hi), "1"(n_lo)) :"0"(n_hi), "1"(n_lo))
#ifdef CONFIG_X86_IO_APIC
extern void check_acpi_pci(void);
#else
static inline void check_acpi_pci(void) { }
#endif
#ifdef CONFIG_ACPI #ifdef CONFIG_ACPI
extern int acpi_lapic; extern int acpi_lapic;
extern int acpi_ioapic; extern int acpi_ioapic;
...@@ -128,8 +134,6 @@ extern int acpi_gsi_to_irq(u32 gsi, unsigned int *irq); ...@@ -128,8 +134,6 @@ extern int acpi_gsi_to_irq(u32 gsi, unsigned int *irq);
extern int skip_ioapic_setup; extern int skip_ioapic_setup;
extern int acpi_skip_timer_override; extern int acpi_skip_timer_override;
extern void check_acpi_pci(void);
static inline void disable_ioapic_setup(void) static inline void disable_ioapic_setup(void)
{ {
skip_ioapic_setup = 1; skip_ioapic_setup = 1;
...@@ -142,8 +146,6 @@ static inline int ioapic_setup_disabled(void) ...@@ -142,8 +146,6 @@ 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
static inline void acpi_noirq_set(void) { acpi_noirq = 1; } static inline void acpi_noirq_set(void) { acpi_noirq = 1; }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment