From owner-svn-src-projects@FreeBSD.ORG  Sun Dec 20 17:53:35 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 8C6921065743;
	Sun, 20 Dec 2009 17:53:35 +0000 (UTC) (envelope-from rrs@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 7C2768FC15;
	Sun, 20 Dec 2009 17:53:35 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id nBKHrZX0070974;
	Sun, 20 Dec 2009 17:53:35 GMT (envelope-from rrs@svn.freebsd.org)
Received: (from rrs@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id nBKHrZwS070972;
	Sun, 20 Dec 2009 17:53:35 GMT (envelope-from rrs@svn.freebsd.org)
Message-Id: <200912201753.nBKHrZwS070972@svn.freebsd.org>
From: Randall Stewart <rrs@FreeBSD.org>
Date: Sun, 20 Dec 2009 17:53:35 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r200755 - projects/mips/sys/mips/rmi
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 20 Dec 2009 17:53:35 -0000

Author: rrs
Date: Sun Dec 20 17:53:35 2009
New Revision: 200755
URL: http://svn.freebsd.org/changeset/base/200755

Log:
  Adds JC's fix to get rid of stray intr's.
  
  Obtained from:	JC - jayachandraanc@netlogicmicro.com

Modified:
  projects/mips/sys/mips/rmi/iodi.c

Modified: projects/mips/sys/mips/rmi/iodi.c
==============================================================================
--- projects/mips/sys/mips/rmi/iodi.c	Sun Dec 20 16:23:11 2009	(r200754)
+++ projects/mips/sys/mips/rmi/iodi.c	Sun Dec 20 17:53:35 2009	(r200755)
@@ -119,7 +119,7 @@ iodi_setup_intr(device_t dev, device_t c
 		xlr_write_reg(mmio, PIC_IRT_1_UART_0, ((1 << 31) | (level << 30) | (1 << 6) | (PIC_UART_0_IRQ)));
 		if (rmi_spin_mutex_safe)
 			mtx_unlock_spin(&xlr_pic_lock);
-		cpu_establish_hardintr("uart", NULL,
+		cpu_establish_hardintr("uart", filt,
 		    (driver_intr_t *) intr, (void *)arg, PIC_UART_0_IRQ, flags, cookiep);
 
 	} else if (strcmp(device_get_name(child), "rge") == 0) {
@@ -133,7 +133,7 @@ iodi_setup_intr(device_t dev, device_t c
 		xlr_write_reg(mmio, PIC_IRT_1_BASE + irq - PIC_IRQ_BASE, reg | (1 << 6) | (1 << 30) | (1 << 31));
 		if (rmi_spin_mutex_safe)
 			mtx_unlock_spin(&xlr_pic_lock);
-		cpu_establish_hardintr("rge", NULL, (driver_intr_t *) intr, (void *)arg, irq, flags, cookiep);
+		cpu_establish_hardintr("rge", filt, (driver_intr_t *) intr, (void *)arg, irq, flags, cookiep);
 
 	} else if (strcmp(device_get_name(child), "ehci") == 0) {
 		if (rmi_spin_mutex_safe)
@@ -142,7 +142,7 @@ iodi_setup_intr(device_t dev, device_t c
 		xlr_write_reg(mmio, PIC_IRT_1_BASE + PIC_USB_IRQ - PIC_IRQ_BASE, reg | (1 << 6) | (1 << 30) | (1 << 31));
 		if (rmi_spin_mutex_safe)
 			mtx_unlock_spin(&xlr_pic_lock);
-		cpu_establish_hardintr("ehci", NULL, (driver_intr_t *) intr, (void *)arg, PIC_USB_IRQ, flags, cookiep);
+		cpu_establish_hardintr("ehci", filt, (driver_intr_t *) intr, (void *)arg, PIC_USB_IRQ, flags, cookiep);
 	}
 	/*
 	 * This causes a panic and looks recursive to me (RRS).