Messages in this thread | | | Date | Sat, 16 Aug 2008 01:26:48 -0700 | From | "Yinghai Lu" <> | Subject | Re: [PATCH] x86: io_apic.c, build fix |
| |
On Sat, Aug 16, 2008 at 1:22 AM, Ingo Molnar <mingo@elte.hu> wrote: > > From 306bb46f92d326c5afae3fa04860bdccb879b6b8 Mon Sep 17 00:00:00 2001 > From: Ingo Molnar <mingo@elte.hu> > Date: Sat, 16 Aug 2008 10:18:31 +0200 > Subject: [PATCH] x86: io_apic.c, build fix > > fix: > > arch/x86/kernel/io_apic.c: In function 'MPBIOS_trigger': > arch/x86/kernel/io_apic.c:1105: error: implicit declaration of function 'default_MCA_trigger' > > the MCA defines got lost in the unification. > > Signed-off-by: Ingo Molnar <mingo@elte.hu> > --- > arch/x86/kernel/io_apic.c | 6 ++++++ > 1 files changed, 6 insertions(+), 0 deletions(-) > > diff --git a/arch/x86/kernel/io_apic.c b/arch/x86/kernel/io_apic.c > index 2043cd8..929429f 100644 > --- a/arch/x86/kernel/io_apic.c > +++ b/arch/x86/kernel/io_apic.c > @@ -1025,6 +1025,12 @@ static int EISA_ELCR(unsigned int irq) > #define default_EISA_trigger(idx) (EISA_ELCR(mp_irqs[idx].mp_srcbusirq)) > #define default_EISA_polarity(idx) default_ISA_polarity(idx) > > +/* MCA interrupts are always polarity zero level triggered, > + * when listed as conforming in the MP table. */ > + > +#define default_MCA_trigger(idx) (1) > +#define default_MCA_polarity(idx) default_ISA_polarity(idx) > + > > static int MPBIOS_polarity(int idx) > { >
ah. EISA got too copies
/* ISA interrupts are always polarity zero edge triggered, * when listed as conforming in the MP table. */
#define default_ISA_trigger(idx) (0) #define default_ISA_polarity(idx) (0)
/* EISA interrupts are always polarity zero and can be edge or level * trigger depending on the ELCR value. If an interrupt is listed as * EISA conforming in the MP table, that means its trigger type must * be read in from the ELCR */
#define default_EISA_trigger(idx) (EISA_ELCR(mp_irqs[idx].mp_srcbusirq)) #define default_EISA_polarity(idx) default_ISA_polarity(idx)
/* PCI interrupts are always polarity one level triggered, * when listed as conforming in the MP table. */
#define default_PCI_trigger(idx) (1) #define default_PCI_polarity(idx) (1)
/* EISA interrupts are always polarity zero and can be edge or level * trigger depending on the ELCR value. If an interrupt is listed as * EISA conforming in the MP table, that means its trigger type must * be read in from the ELCR */
#define default_EISA_trigger(idx) (EISA_ELCR(mp_irqs[idx].mp_srcbusirq)) #define default_EISA_polarity(idx) default_ISA_polarity(idx)
need to remove the extra one.
YH
| |