diff options
| author | Herbert Poetzl <herbert@13thfloor.at> | 2006-03-22 00:07:34 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-22 07:53:54 -0800 |
| commit | 152475cb0a65ed73301cfbd7d7afab65536643f7 (patch) | |
| tree | 197571b8d8786a4a0c7b88f107d3cd96c4b4b36d /include/asm-i386 | |
| parent | 9430d58e34ec3861e1ca72f8e49105b227aad327 (diff) | |
| download | kernel_samsung_smdk4412-152475cb0a65ed73301cfbd7d7afab65536643f7.zip kernel_samsung_smdk4412-152475cb0a65ed73301cfbd7d7afab65536643f7.tar.gz kernel_samsung_smdk4412-152475cb0a65ed73301cfbd7d7afab65536643f7.tar.bz2 | |
[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: Herbert Pötzl <herbert@13thfloor.at>
Cc: "Brown, Len" <len.brown@intel.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/asm-i386')
| -rw-r--r-- | include/asm-i386/acpi.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/include/asm-i386/acpi.h b/include/asm-i386/acpi.h index 55059ab..20f5239 100644 --- a/include/asm-i386/acpi.h +++ b/include/asm-i386/acpi.h @@ -103,6 +103,12 @@ __acpi_release_global_lock (unsigned int *lock) :"=r"(n_hi), "=r"(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 extern int acpi_lapic; extern int acpi_ioapic; @@ -128,8 +134,6 @@ extern int acpi_gsi_to_irq(u32 gsi, unsigned int *irq); 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; @@ -142,8 +146,6 @@ static inline int ioapic_setup_disabled(void) #else static inline void disable_ioapic_setup(void) { } -static inline void check_acpi_pci(void) { } - #endif static inline void acpi_noirq_set(void) { acpi_noirq = 1; } |