From owner-freebsd-current@FreeBSD.ORG  Wed May  5 04:31:44 2004
Return-Path: <owner-freebsd-current@FreeBSD.ORG>
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 80EAB16A4CE; Wed,  5 May 2004 04:31:44 -0700 (PDT)
Received: from elvis.mu.org (elvis.mu.org [192.203.228.196])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 3BBD043D39; Wed,  5 May 2004 04:31:44 -0700 (PDT)
	(envelope-from mux@freebsd.org)
Received: by elvis.mu.org (Postfix, from userid 1920)
	id 3163F5C821; Wed,  5 May 2004 04:31:44 -0700 (PDT)
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
Message-ID: <20040505113144.GE700@elvis.mu.org>
References: <20040505111212.GA52672@cserv62.csub.edu>
Mime-Version: 1.0
Content-Type: multipart/mixed; boundary="/WwmFnJnmDyWGHa4"
Content-Disposition: inline
In-Reply-To: <20040505111212.GA52672@cserv62.csub.edu>
User-Agent: Mutt/1.4.2.1i
cc: jhb@FreeBSD.org
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
	<freebsd-current.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>,
	<mailto:freebsd-current-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-current>
List-Post: <mailto:freebsd-current@freebsd.org>
List-Help: <mailto:freebsd-current-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>,
	<mailto:freebsd-current-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 05 May 2004 11:31:44 -0000


--/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--