From owner-p4-projects@FreeBSD.ORG  Sat Feb  9 20:01:43 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 31D0916A46D; Sat,  9 Feb 2008 20:01:43 +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 D264D16A46B
	for <perforce@freebsd.org>; Sat,  9 Feb 2008 20:01:42 +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 C42D713C45A
	for <perforce@freebsd.org>; Sat,  9 Feb 2008 20:01:42 +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 m19K1gtD080727
	for <perforce@freebsd.org>; Sat, 9 Feb 2008 20:01:42 GMT
	(envelope-from cognet@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m19K1fie080724
	for perforce@freebsd.org; Sat, 9 Feb 2008 20:01:41 GMT
	(envelope-from cognet@freebsd.org)
Date: Sat, 9 Feb 2008 20:01:41 GMT
Message-Id: <200802092001.m19K1fie080724@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 135117 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, 09 Feb 2008 20:01:43 -0000

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

Change 135117 by cognet@cognet-mips on 2008/02/09 20:00:41

	Remove the Octeon specific hack to enable interrupts in 
	nexus_setup_intr(), it doesn't help that much.

Affected files ...

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

Differences ...

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

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