2008-10-13 22:59:18

by Simon Holm Thøgersen

Subject: [PATCH] x86: fix compile warning for !(ACPI && X86_IO_APIC) builds

This fixes the following compile warning for !(ACPI && X86_IO_APIC) builds:

arch/x86/kernel/early-quirks.c:99: warning: 'ati_ixp4x0_rev' defined
but not used

that was introduced by 33fb0e4 (x86: SB450: skip IRQ0 override if it is not
routed to INT2 of IOAPIC).

Signed-off-by: Simon Holm Thøgersen <[email protected]>
---
arch/x86/kernel/early-quirks.c | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/arch/x86/kernel/early-quirks.c b/arch/x86/kernel/early-quirks.c
index 733c4f8..f60afb6 100644
--- a/arch/x86/kernel/early-quirks.c
+++ b/arch/x86/kernel/early-quirks.c
@@ -95,6 +95,7 @@ static void __init nvidia_bugs(int num, int slot, int func)

}

+#if defined(CONFIG_ACPI) && defined (CONFIG_X86_IO_APIC)
static u32 ati_ixp4x0_rev(int num, int slot, int func)
{
u32 d;
@@ -115,7 +116,6 @@ static u32 ati_ixp4x0_rev(int num, int slot, int func)

static void __init ati_bugs(int num, int slot, int func)
{
-#if defined(CONFIG_ACPI) && defined (CONFIG_X86_IO_APIC)
u32 d;
u8 b;

@@ -138,8 +138,12 @@ static void __init ati_bugs(int num, int slot, int func)
printk(KERN_INFO "If you got timer trouble "
"try acpi_use_timer_override\n");
}
-#endif
}
+#else
+static void __init ati_bugs(int num, int slot, int func)
+{
+}
+#endif

#ifdef CONFIG_DMAR
static void __init intel_g33_dmar(int num, int slot, int func)
--
1.5.6.2.255.gbed62

2008-10-14 11:54:13

by tip-bot for Andreas Herrmann

Subject: Re: [PATCH] x86: fix compile warning for !(ACPI && X86_IO_APIC) builds

On Tue, Oct 14, 2008 at 01:00:50AM +0200, Simon Holm Th?gersen wrote:
> This fixes the following compile warning for !(ACPI && X86_IO_APIC) builds:
>
> arch/x86/kernel/early-quirks.c:99: warning: 'ati_ixp4x0_rev' defined
> but not used

Acked-by: Andreas Herrmann <[email protected]>


Makes sense.

Thanks,

Andreas

2008-10-16 11:57:54

by tip-bot for Andreas Herrmann

Subject: Re: [PATCH] x86: fix compile warning for !(ACPI && X86_IO_APIC) builds

On Tue, Oct 14, 2008 at 01:53:07PM +0200, Andreas Herrmann wrote:
> On Tue, Oct 14, 2008 at 01:00:50AM +0200, Simon Holm Th?gersen wrote:
> > This fixes the following compile warning for !(ACPI && X86_IO_APIC) builds:
> >
> > arch/x86/kernel/early-quirks.c:99: warning: 'ati_ixp4x0_rev' defined
> > but not used
>
> Acked-by: Andreas Herrmann <[email protected]>
>

Ingo,

maybe it's best to just apply this patch

http://marc.info/?l=linux-kernel&m=122406442128207

It should also fix the compile warning.


Thanks,

Andreas