Date: Wed, 5 May 2004 13:31:44 +0200 From: Maxime Henrion <mux@freebsd.org> To: Russell Jackson <rjackson@FreeBSD.ORG>, freebsd-current@freebsd.org Cc: jhb@FreeBSD.org Subject: Re: kernel build: machdep.c Message-ID: <20040505113144.GE700@elvis.mu.org> In-Reply-To: <20040505111212.GA52672@cserv62.csub.edu> References: <20040505111212.GA52672@cserv62.csub.edu>
next in thread | previous in thread | raw e-mail | index | archive | help
--/WwmFnJnmDyWGHa4
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Russell Jackson wrote:
> Tonights kernel seems to be broken with:
>
> /usr/src/sys/i386/i386/machdep.c:2812: error: conflicting types for
> `ioapic_set_
> polarity'
> machine/apicvar.h:145: error: previous declaration of
> `ioapic_set_polarity'
> /usr/src/sys/i386/i386/machdep.c:2818: error: conflicting types for
> `ioapic_set_
> triggermode'
> machine/apicvar.h:147: error: previous declaration of
> `ioapic_set_triggermode'
> /usr/src/sys/i386/i386/machdep.c:2840: error: conflicting types for
> `lapic_set_l
> vt_polarity'
> machine/apicvar.h:165: error: previous declaration of
> `lapic_set_lvt_polarity'
> /usr/src/sys/i386/i386/machdep.c:2846: error: conflicting types for
> `lapic_set_l
> vt_triggermode'
> machine/apicvar.h:167: error: previous declaration of
> `lapic_set_lvt_triggermode
> '
The attached patch should fix this issue. Please let me know if it does.
Cheers,
Maxime
--/WwmFnJnmDyWGHa4
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="machdep.patch"
Index: machdep.c
===================================================================
RCS file: /space2/ncvs/src/sys/i386/i386/machdep.c,v
retrieving revision 1.586
diff -u -p -r1.586 machdep.c
--- machdep.c 2 Feb 2004 23:22:24 -0000 1.586
+++ machdep.c 5 May 2004 13:51:34 -0000
@@ -2808,13 +2808,13 @@ ioapic_set_nmi(void *cookie, u_int pin)
}
int
-ioapic_set_polarity(void *cookie, u_int pin, char activehi)
+ioapic_set_polarity(void *cookie, u_int pin, enum intr_polarity pol)
{
return (ENXIO);
}
int
-ioapic_set_triggermode(void *cookie, u_int pin, char edgetrigger)
+ioapic_set_triggermode(void *cookie, u_int pin, enum intr_trigger trigger)
{
return (ENXIO);
}
@@ -2836,13 +2836,13 @@ lapic_set_lvt_mode(u_int apic_id, u_int
}
int
-lapic_set_lvt_polarity(u_int apic_id, u_int lvt, u_char activehi)
+lapic_set_lvt_polarity(u_int apic_id, u_int lvt, enum intr_polarity pol)
{
return (ENXIO);
}
int
-lapic_set_lvt_triggermode(u_int apic_id, u_int lvt, u_char edgetrigger)
+lapic_set_lvt_triggermode(u_int apic_id, u_int lvt, enum intr_trigger trigger)
{
return (ENXIO);
}
--/WwmFnJnmDyWGHa4--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20040505113144.GE700>