[PATCH 28/58] x86: io_apic: Don't define acpi_get_override_irq if CONFIG_ACPI=n

[Josh Triplett]

arch/x86/kernel/apic/io_apic.c defines acpi_get_override_irq
unconditionally, but linux/acpi.h only prototypes it if CONFIG_ACPI=y,
and nothing calls it unless CONFIG_ACPI=y.  Make the definition itself
conditional on CONFIG_ACPI.  This saves space when CONFIG_ACPI=n, and
eliminates warnings from GCC (-Wmissing-prototypes) and Sparse (-Wdecl).

arch/x86/kernel/apic/io_apic.c:3638:5: warning: no previous prototype for âacpi_get_override_irqâ [-Wmissing-prototypes]

Signed-off-by: Josh Triplett <josh@xxxxxxxxxxxxxxxx>
---
 arch/x86/kernel/apic/io_apic.c |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
index 1817fa9..6d01108 100644
--- a/arch/x86/kernel/apic/io_apic.c
+++ b/arch/x86/kernel/apic/io_apic.c
@@ -3635,6 +3635,7 @@ static int __init io_apic_get_version(int ioapic)
 	return reg_01.bits.version;
 }
 
+#ifdef CONFIG_ACPI
 int acpi_get_override_irq(u32 gsi, int *trigger, int *polarity)
 {
 	int ioapic, pin, idx;
@@ -3658,6 +3659,7 @@ int acpi_get_override_irq(u32 gsi, int *trigger, int *polarity)
 	*polarity = irq_polarity(idx);
 	return 0;
 }
+#endif
 
 /*
  * This function currently is only a helper for the i386 smp boot process where
-- 
1.7.10.4

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/