From owner-freebsd-current@FreeBSD.ORG Wed May 5 05:06:51 2004 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2D2B316A4CE for ; Wed, 5 May 2004 05:06:51 -0700 (PDT) Received: from cserv62.csub.edu (cserv62.csub.edu [136.168.10.62]) by mx1.FreeBSD.org (Postfix) with ESMTP id BB1F343D48 for ; Wed, 5 May 2004 05:06:50 -0700 (PDT) (envelope-from rjackson@cserv62.csub.edu) Received: from cserv62.csub.edu (localhost [127.0.0.1]) by cserv62.csub.edu (8.12.9/8.12.9) with ESMTP id i45C6aSS061307 for ; Wed, 5 May 2004 05:06:50 -0700 (PDT) (envelope-from rjackson@cserv62.csub.edu) Received: (from rjackson@localhost) by cserv62.csub.edu (8.12.9/8.12.9/Submit) id i45C6aqH061286 for freebsd-current@freebsd.org; Wed, 5 May 2004 05:06:36 -0700 (PDT) (envelope-from rjackson) Date: Wed, 5 May 2004 05:06:36 -0700 From: Russell Jackson To: freebsd-current@freebsd.org Message-ID: <20040505120636.GA61160@cserv62.csub.edu> Mail-Followup-To: Russell Jackson , freebsd-current@freebsd.org References: <20040505111212.GA52672@cserv62.csub.edu> <20040505113144.GE700@elvis.mu.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20040505113144.GE700@elvis.mu.org> User-Agent: Mutt/1.4.1i Subject: Re: kernel build: machdep.c X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 05 May 2004 12:06:51 -0000 On Wed, May 05, 2004 at 01:31:44PM +0200, Maxime Henrion wrote: > 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 > 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); > } > _______________________________________________ > freebsd-current@freebsd.org mailing list > http://lists.freebsd.org/mailman/listinfo/freebsd-current > To unsubscribe, send any mail to "freebsd-current-unsubscribe@freebsd.org" Indeed, it does. Thanks. -- Russell A. Jackson (rjackson@cserv62.csub.edu)