Hi Andrew! Folks!
check_acpi_pci() is called form 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,
so either we need to move the declaration outside the
CONFIG_ACPI check, or alternatively move the call in
setup.c inside the CONFIG_ACPI one
attached two patches which would do this
best,
Herbert
Signed-off-by: Herbert Pötzl <[email protected]>
--- ./include/asm/acpi.h.orig 2006-03-15 01:06:10 +0100
+++ ./include/asm/acpi.h 2006-03-15 01:38:25 +0100
@@ -103,6 +103,12 @@ __acpi_release_global_lock (unsigned int
:"=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, unsi
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(
#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; }
alternatively:
--- ./arch/i386/kernel/setup.c.orig 2006-03-15 01:05:09 +0100
+++ ./arch/i386/kernel/setup.c 2006-03-15 01:25:41 +0100
@@ -1599,11 +1599,10 @@ void __init setup_arch(char **cmdline_p)
if (efi_enabled)
efi_map_memmap();
+#ifdef CONFIG_ACPI
#ifdef CONFIG_X86_IO_APIC
check_acpi_pci(); /* Checks more than just ACPI actually */
#endif
-
-#ifdef CONFIG_ACPI
/*
* Parse the ACPI tables for possible boot-time SMP configuration.
*/
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Stuff]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
[Linux Resources]
