From: Herbert Poetzl <herbert@13thfloor.at>
To: Linux Kernel ML <linux-kernel@vger.kernel.org>,
Andrew Morton <akpm@osdl.org>
Subject: [PATCH] 2.6.16-rc6 calls check_acpi_pci() on x86 with ACPI disabled
Date: Wed, 15 Mar 2006 02:31:25 +0100 [thread overview]
Message-ID: <20060315013125.GA24402@MAIL.13thfloor.at> (raw)
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 <herbert@13thfloor.at>
--- ./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.
*/
next reply other threads:[~2006-03-15 1:31 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-03-15 1:31 Herbert Poetzl [this message]
2006-03-15 1:45 ` [PATCH] 2.6.16-rc6 calls check_acpi_pci() on x86 with ACPI disabled Andrew Morton
2006-03-15 1:53 ` Herbert Poetzl
2006-03-15 2:06 ` Andrew Morton
2006-03-15 2:13 ` Herbert Poetzl
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20060315013125.GA24402@MAIL.13thfloor.at \
--to=herbert@13thfloor.at \
--cc=akpm@osdl.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.