From: Andrew Morton <akpm@osdl.org>
To: Herbert Poetzl <herbert@13thfloor.at>
Cc: linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org, "Brown,
Len" <len.brown@intel.com>
Subject: Re: [PATCH] 2.6.16-rc6 calls check_acpi_pci() on x86 with ACPI disabled
Date: Tue, 14 Mar 2006 17:45:40 -0800 [thread overview]
Message-ID: <20060314174540.5c138458.akpm@osdl.org> (raw)
In-Reply-To: <20060315013125.GA24402@MAIL.13thfloor.at>
Herbert Poetzl <herbert@13thfloor.at> wrote:
>
>
> 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,
Well that's a shame.
> 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
Prefer the first version. But it'll break if CONFIG_X86_IO_APIC &&
!CONFIG_ACPI
So how's about this?
From: Herbert Poetzl <herbert@13thfloor.at>
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: Andrew Morton <akpm@osdl.org>
---
include/asm/acpi.h | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff -puN include/asm/acpi.h~dont-check_acpi_pci-on-x86-with-acpi-disabled include/asm/acpi.h
--- devel/include/asm/acpi.h~dont-check_acpi_pci-on-x86-with-acpi-disabled 2006-03-14 17:42:11.000000000 -0800
+++ devel-akpm/include/asm/acpi.h 2006-03-14 17:44:50.000000000 -0800
@@ -103,6 +103,12 @@ __acpi_release_global_lock (unsigned int
:"=r"(n_hi), "=r"(n_lo) \
:"0"(n_hi), "1"(n_lo))
+#if defined(CONFIG_ACPI) && defined(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; }
_
next parent reply other threads:[~2006-03-15 1:48 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20060315013125.GA24402@MAIL.13thfloor.at>
2006-03-15 1:45 ` Andrew Morton [this message]
2006-03-15 1:53 ` [PATCH] 2.6.16-rc6 calls check_acpi_pci() on x86 with ACPI disabled 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=20060314174540.5c138458.akpm@osdl.org \
--to=akpm@osdl.org \
--cc=herbert@13thfloor.at \
--cc=len.brown@intel.com \
--cc=linux-acpi@vger.kernel.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox