From owner-freebsd-xen@FreeBSD.ORG  Wed Apr  1 10:31:42 2009
Return-Path: <owner-freebsd-xen@FreeBSD.ORG>
Delivered-To: freebsd-xen@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 2F3181065670;
	Wed,  1 Apr 2009 10:31:42 +0000 (UTC)
	(envelope-from bjacke@sernet.de)
Received: from mail.SerNet.de (mail1.SerNet.de [193.175.80.2])
	by mx1.freebsd.org (Postfix) with ESMTP id DA7138FC16;
	Wed,  1 Apr 2009 10:31:41 +0000 (UTC)
	(envelope-from bjacke@sernet.de)
Received: from intern.SerNet.DE by mail.SerNet.DE with esmtp (Exim 4.63 #1)
	id 1LoxIb-0008Ek-TQ; Wed, 01 Apr 2009 12:03:57 +0200
Received: by intern.SerNet.DE
	id 1LoxIb-005cL7-Ky; Wed, 01 Apr 2009 12:03:57 +0200
Received: by intern.SerNet.DE
	id 1LoxIb-005cL0-Bt; Wed, 01 Apr 2009 12:03:57 +0200
Received: from bjacke by pell.sernet.de with local (Exim 4.69)
	(envelope-from <bjacke@sernet.de>)
	id 1LoxJH-0001N5-1w; Wed, 01 Apr 2009 12:04:39 +0200
Date: Wed, 1 Apr 2009 12:04:38 +0200
From: =?iso-8859-1?Q?Bj=F6rn?= JACKE <bj@SerNet.DE>
To: Mister Olli <mister.olli@googlemail.com>
References: <1238162602.24399.29.camel@phoenix.blechhirn.net>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="W/nzBZO5zC0uMSeA"
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
In-Reply-To: <1238162602.24399.29.camel@phoenix.blechhirn.net>
X-Q: Sprechen und Hoeren ist Befruchten und Empfangen. (Novalis)
Message-Id: <E1LoxIb-005cL7-Ky@intern.SerNet.DE>
Organization: SerNet GmbH, Goettingen, Germany
Cc: freebsd-xen@freebsd.org, freebsd-current@freebsd.org
Subject: Re: Compiling CURRENT with XEN config fails
X-BeenThere: freebsd-xen@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Discussion of the freebsd port to xen - implementation and usage
	<freebsd-xen.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-xen>,
	<mailto:freebsd-xen-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-xen>
List-Post: <mailto:freebsd-xen@freebsd.org>
List-Help: <mailto:freebsd-xen-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-xen>,
	<mailto:freebsd-xen-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 01 Apr 2009 10:31:42 -0000


--W/nzBZO5zC0uMSeA
Content-Type: text/plain; charset=iso-8859-1
Content-Disposition: inline
Content-Transfer-Encoding: 8bit

On 2009-03-27 at 15:03 +0100 Mister Olli sent off:
> /usr/src/sys/xen/evtchn/evtchn.c:516: error: conflicting types for 'bind_virq_to_irqhandler'
> /usr/src/sys/xen/xen_intr.h:61: error: previous declaration of 'bind_virq_to_irqhandler' was here
> /usr/src/sys/xen/evtchn/evtchn.c: In function 'bind_virq_to_irqhandler':
> /usr/src/sys/xen/evtchn/evtchn.c:523: error: 'arg' undeclared (first use in this function)
> /usr/src/sys/xen/evtchn/evtchn.c:523: error: (Each undeclared identifier is reported only once
> /usr/src/sys/xen/evtchn/evtchn.c:523: error: for each function it appears in.)
> *** Error code 1

the attached patch should fix this one. Can someone review that please?

Thanks
Björn

--W/nzBZO5zC0uMSeA
Content-Type: text/x-patch; charset=us-ascii
Content-Disposition: attachment; filename="freebsd-head-evtchn-build-fix.patch"

Index: xen/evtchn/evtchn.c
===================================================================
--- xen/evtchn/evtchn.c	(Revision 190598)
+++ xen/evtchn/evtchn.c	(Arbeitskopie)
@@ -512,7 +512,7 @@
 int 
 bind_virq_to_irqhandler(unsigned int virq, unsigned int cpu,
     const char *devname, driver_filter_t filter, driver_intr_t handler,
-    unsigned long irqflags, unsigned int *irqp)
+    void *arg, unsigned long irqflags, unsigned int *irqp)
 {
 	unsigned int irq;
 	int error;

--W/nzBZO5zC0uMSeA--