> > --- 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.
It would be better to compile _none_ of acpi_get_override_irq() for !ACPI.
-Len
_______________________________________________
stable mailing list
[email protected]
http://linux.kernel.org/mailman/listinfo/stable