From owner-p4-projects@FreeBSD.ORG  Sun Jan 21 16:18:24 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 0A79016A406; Sun, 21 Jan 2007 16:18:24 +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 B49F716A400
	for <perforce@freebsd.org>; Sun, 21 Jan 2007 16:18:23 +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 A5FDF13C459
	for <perforce@freebsd.org>; Sun, 21 Jan 2007 16:18:23 +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 l0LGINEh064206
	for <perforce@freebsd.org>; Sun, 21 Jan 2007 16:18:23 GMT
	(envelope-from piso@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0LGINAt064197
	for perforce@freebsd.org; Sun, 21 Jan 2007 16:18:23 GMT
	(envelope-from piso@freebsd.org)
Date: Sun, 21 Jan 2007 16:18:23 GMT
Message-Id: <200701211618.l0LGINAt064197@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 113256 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: Sun, 21 Jan 2007 16:18:24 -0000

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

Change 113256 by piso@piso_newluxor on 2007/01/21 16:17:42

	Fixed mismerge.

Affected files ...

.. //depot/projects/soc2006/intr_filter/dev/le/if_le_lebuffer.c#2 edit
.. //depot/projects/soc2006/intr_filter/sparc64/sparc64/upa.c#3 edit

Differences ...

==== //depot/projects/soc2006/intr_filter/dev/le/if_le_lebuffer.c#2 (text+ko) ====

@@ -341,7 +341,7 @@
 	}
 
 	error = bus_setup_intr(dev, lesc->sc_ires, INTR_TYPE_NET | INTR_MPSAFE,
-	    am7990_intr, sc, &lesc->sc_ih);
+	    NULL, am7990_intr, sc, &lesc->sc_ih);
 	if (error != 0) {
 		device_printf(dev, "cannot set up interrupt\n");
 		goto fail_am7990;

==== //depot/projects/soc2006/intr_filter/sparc64/sparc64/upa.c#3 (text+ko) ====

@@ -401,7 +401,7 @@
 
 static int
 upa_setup_intr(device_t dev, device_t child, struct resource *ires, int flags,
-    driver_intr_t *func, void *arg, void **cookiep)
+    driver_filter_t *filt, driver_intr_t *func, void *arg, void **cookiep)
 {
 	struct upa_softc *sc;
 	uint64_t intrmap;
@@ -427,8 +427,8 @@
 
 	UPA_WRITE(sc, imr, 0x0, intrmap & ~INTMAP_V);
 	(void)UPA_READ(sc, imr, 0x0);
-	error = bus_generic_setup_intr(dev, child, ires, flags, func, arg,
-	    cookiep);
+	error = bus_generic_setup_intr(dev, child, ires, flags, filt, func, 
+	    arg, cookiep);
 	if (error != 0)
 		return (error);
 	UPA_WRITE(sc, imr, 0x0, INTMAP_ENABLE(intrmap, PCPU_GET(mid)));