From owner-p4-projects@FreeBSD.ORG  Tue Oct 10 23:11:19 2006
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 1349616A47B; Tue, 10 Oct 2006 23:11:19 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id C746416A416
	for <perforce@freebsd.org>; Tue, 10 Oct 2006 23:11:18 +0000 (UTC)
	(envelope-from piso@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id AD1C743D64
	for <perforce@freebsd.org>; Tue, 10 Oct 2006 23:11:17 +0000 (GMT)
	(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 k9ANBH6E087978
	for <perforce@freebsd.org>; Tue, 10 Oct 2006 23:11:17 GMT
	(envelope-from piso@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9ANBHZM087975
	for perforce@freebsd.org; Tue, 10 Oct 2006 23:11:17 GMT
	(envelope-from piso@freebsd.org)
Date: Tue, 10 Oct 2006 23:11:17 GMT
Message-Id: <200610102311.k9ANBHZM087975@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 107648 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: Tue, 10 Oct 2006 23:11:19 -0000

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

Change 107648 by piso@piso_newluxor on 2006/10/10 23:11:00

	Compilation

Affected files ...

.. //depot/projects/soc2006/intr_filter/dev/ipmi/ipmi.c#3 edit
.. //depot/projects/soc2006/intr_filter/pci/intpm.c#4 edit

Differences ...

==== //depot/projects/soc2006/intr_filter/dev/ipmi/ipmi.c#3 (text) ====

@@ -850,7 +850,7 @@
 
 	if (sc->ipmi_irq_res != NULL && sc->ipmi_intr != NULL) {
 		error = bus_setup_intr(dev, sc->ipmi_irq_res, INTR_TYPE_MISC,
-		    sc->ipmi_intr, sc, &sc->ipmi_irq);
+		    NULL, sc->ipmi_intr, sc, &sc->ipmi_irq);
 		if (error) {
 			device_printf(dev, "can't set up interrupt\n");
 			return (error);

==== //depot/projects/soc2006/intr_filter/pci/intpm.c#4 (text+ko) ====

@@ -746,8 +746,7 @@
 		device_printf(dev, "could not allocate irq");
 		return (ENOMEM);
 	}
-	error = bus_setup_intr(dev, res, INTR_TYPE_MISC, intpm_intr, sc, &ih);
-	error=bus_setup_intr(dev, res, INTR_TYPE_MISC, NULL, (driver_intr_t *) intpm_intr,sciic, &ih);
+	error = bus_setup_intr(dev, res, INTR_TYPE_MISC, NULL, intpm_intr, sc, &ih);
 	if (error) {
 		device_printf(dev, "Failed to map intr\n");
 		return (error);