From owner-svn-src-head@FreeBSD.ORG Tue Jul 21 16:54:12 2009 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2DA84106566C; Tue, 21 Jul 2009 16:54:12 +0000 (UTC) (envelope-from alc@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 1C8AB8FC08; Tue, 21 Jul 2009 16:54:12 +0000 (UTC) (envelope-from alc@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n6LGsCFX016649; Tue, 21 Jul 2009 16:54:12 GMT (envelope-from alc@svn.freebsd.org) Received: (from alc@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n6LGsB5l016647; Tue, 21 Jul 2009 16:54:12 GMT (envelope-from alc@svn.freebsd.org) Message-Id: <200907211654.n6LGsB5l016647@svn.freebsd.org> From: Alan Cox Date: Tue, 21 Jul 2009 16:54:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r195806 - head/sys/xen/evtchn X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 21 Jul 2009 16:54:12 -0000 Author: alc Date: Tue Jul 21 16:54:11 2009 New Revision: 195806 URL: http://svn.freebsd.org/changeset/base/195806 Log: Catch up with r195249, "Improve the handling of cpuset with interrupts." Specifically, update the return type of xenpic_assign_cpu() so that this file compiles again. Approved by: re (kib) Modified: head/sys/xen/evtchn/evtchn.c Modified: head/sys/xen/evtchn/evtchn.c ============================================================================== --- head/sys/xen/evtchn/evtchn.c Tue Jul 21 15:06:10 2009 (r195805) +++ head/sys/xen/evtchn/evtchn.c Tue Jul 21 16:54:11 2009 (r195806) @@ -626,7 +626,7 @@ static int xenpic_vector(struct int static int xenpic_source_pending(struct intsrc *isrc); static void xenpic_suspend(struct pic* pic); static void xenpic_resume(struct pic* pic); -static void xenpic_assign_cpu(struct intsrc *, u_int apic_id); +static int xenpic_assign_cpu(struct intsrc *, u_int apic_id); struct pic xenpic_dynirq_template = { @@ -752,10 +752,11 @@ xenpic_resume(struct pic* pic) TODO; } -static void +static int xenpic_assign_cpu(struct intsrc *isrc, u_int apic_id) { TODO; + return (EOPNOTSUPP); } void