From owner-p4-projects@FreeBSD.ORG  Fri Mar  9 17:08:59 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id C311C16A404; Fri,  9 Mar 2007 17:08:59 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 9A06C16A400
	for <perforce@freebsd.org>; Fri,  9 Mar 2007 17:08:59 +0000 (UTC)
	(envelope-from piso@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id 8B49413C491
	for <perforce@freebsd.org>; Fri,  9 Mar 2007 17:08:59 +0000 (UTC)
	(envelope-from piso@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l29H8x9h094163
	for <perforce@freebsd.org>; Fri, 9 Mar 2007 17:08:59 GMT
	(envelope-from piso@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l29H8xai094160
	for perforce@freebsd.org; Fri, 9 Mar 2007 17:08:59 GMT
	(envelope-from piso@freebsd.org)
Date: Fri, 9 Mar 2007 17:08:59 GMT
Message-Id: <200703091708.l29H8xai094160@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	piso@freebsd.org using -f
From: Paolo Pisati <piso@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 115616 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 09 Mar 2007 17:09:00 -0000

http://perforce.freebsd.org/chv.cgi?CH=115616

Change 115616 by piso@piso_newluxor on 2007/03/09 17:08:38

	Fix compilation for non-INTR_FILTER case.

Affected files ...

.. //depot/projects/soc2006/intr_filter/kern/kern_intr.c#39 edit

Differences ...

==== //depot/projects/soc2006/intr_filter/kern/kern_intr.c#39 (text+ko) ====

@@ -893,8 +893,13 @@
 		if (!(ie->ie_flags & IE_SOFT))
 			return (EINVAL);
 	} else {
+#ifdef INTR_FILTER
 		error = intr_event_create(&ie, NULL, IE_SOFT,
 		    NULL, NULL, NULL, "swi%d:", pri);
+#else
+		error = intr_event_create(&ie, NULL, IE_SOFT,
+		    NULL, "swi%d:", pri);
+#endif
 		if (error)
 			return (error);
 		if (eventp != NULL)
@@ -927,7 +932,11 @@
 
 	if (!(flags & SWI_DELAY)) {
 		PCPU_LAZY_INC(cnt.v_soft);
+#ifdef INTR_FILTER
 		error = intr_event_schedule_thread(ie, ie->ie_thread);
+#else
+		error = intr_event_schedule_thread(ie);
+#endif
 		KASSERT(error == 0, ("stray software interrupt"));
 	}
 }