From owner-p4-projects@FreeBSD.ORG  Sat Feb  2 18:53:27 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 7582E16A419; Sat,  2 Feb 2008 18:53:27 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 22CC216A417
	for <perforce@freebsd.org>; Sat,  2 Feb 2008 18:53:27 +0000 (UTC)
	(envelope-from cognet@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 163E313C442
	for <perforce@freebsd.org>; Sat,  2 Feb 2008 18:53:27 +0000 (UTC)
	(envelope-from cognet@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m12IrQMn053630
	for <perforce@freebsd.org>; Sat, 2 Feb 2008 18:53:26 GMT
	(envelope-from cognet@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m12IrQdN053627
	for perforce@freebsd.org; Sat, 2 Feb 2008 18:53:26 GMT
	(envelope-from cognet@freebsd.org)
Date: Sat, 2 Feb 2008 18:53:26 GMT
Message-Id: <200802021853.m12IrQdN053627@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	cognet@freebsd.org using -f
From: Olivier Houchard <cognet@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 134662 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: Sat, 02 Feb 2008 18:53:27 -0000

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

Change 134662 by cognet@cognet-mips on 2008/02/02 18:53:25

	Enable interrupts in nexus_setup_intr() for octeon for now.
	That's probably not the best place to do it, and it should be moved 
	later, but that's what the cavium port does.

Affected files ...

.. //depot/projects/mips2-jnpr/src/sys/mips/mips/nexus.c#2 edit

Differences ...

==== //depot/projects/mips2-jnpr/src/sys/mips/mips/nexus.c#2 (text+ko) ====

@@ -183,7 +183,11 @@
 
 	cpu_establish_hardintr(device_get_nameunit(child), filt, intr, arg,
 	    irq, flags, cookiep);
+#ifdef TARGET_OCTEON
+	intr_enable();
+#else
 	intr_restore(sr);
+#endif
 
 	return (0);
 }