Ingo Molnar <[email protected]> writes: > * Florian Mickler <[email protected]> wrote: > >> --- a/arch/x86/kernel/apic/io_apic.c >> +++ b/arch/x86/kernel/apic/io_apic.c >> @@ -3789,6 +3789,10 @@ int acpi_get_override_irq(u32 gsi, int *trigger, int >> *polarity) >> { >> int ioapic, pin, idx; >> >> +#ifdef CONFIG_ACPI >> + if (acpi_irq_model != ACPI_IRQ_MODEL_IOAPIC) >> + return -1; >> +#endif > > That #ifdef is very ugly. Please introduce a suitable helper function in > arch/x86/include/asm/acpi.h - acpi_irq_ioapic_model() or so, which could be > used like this: > > if (!acpi_irq_ioapic_model()) > return -1; > > And would be defined in the !CONFIG_ACPI case as well.
If you want clean this function needs to be moved out of io_apic.c where into acpi.c where it belongs. I don't know that going that far to fix an annoying warning message is warranted. The function should only have callers when acpi is compiled so it is safe to make the entire function #ifdef ACPI. A silly helper in acpi.h is definitely the wrong way to go. Eric _______________________________________________ stable mailing list [email protected] http://linux.kernel.org/mailman/listinfo/stable
