From owner-svn-src-head@FreeBSD.ORG  Wed Oct 16 04:11:43 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 14433688;
 Wed, 16 Oct 2013 04:11:43 +0000 (UTC)
 (envelope-from jhibbits@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 008622DF0;
 Wed, 16 Oct 2013 04:11:43 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9G4BgT4040111;
 Wed, 16 Oct 2013 04:11:42 GMT
 (envelope-from jhibbits@svn.freebsd.org)
Received: (from jhibbits@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9G4Bglc040109;
 Wed, 16 Oct 2013 04:11:42 GMT
 (envelope-from jhibbits@svn.freebsd.org)
Message-Id: <201310160411.r9G4Bglc040109@svn.freebsd.org>
From: Justin Hibbits <jhibbits@FreeBSD.org>
Date: Wed, 16 Oct 2013 04:11:42 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r256581 - head/sys/powerpc/aim
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 16 Oct 2013 04:11:43 -0000

Author: jhibbits
Date: Wed Oct 16 04:11:42 2013
New Revision: 256581
URL: http://svnweb.freebsd.org/changeset/base/256581

Log:
  Fix the Wii build, and remove an extraneous critical_enter().

Modified:
  head/sys/powerpc/aim/interrupt.c

Modified: head/sys/powerpc/aim/interrupt.c
==============================================================================
--- head/sys/powerpc/aim/interrupt.c	Wed Oct 16 04:10:28 2013	(r256580)
+++ head/sys/powerpc/aim/interrupt.c	Wed Oct 16 04:11:42 2013	(r256581)
@@ -101,17 +101,16 @@ powerpc_interrupt(struct trapframe *fram
 		atomic_subtract_int(&td->td_intr_nesting_level, 1);
 		critical_exit();
 		break;
+#ifdef HWPMC_HOOKS
 	case EXC_PERF:
 		critical_enter();
 		KASSERT(pmc_intr != NULL, ("Performance exception, but no handler!"));
 		(*pmc_intr)(PCPU_GET(cpuid), framep);
-		critical_enter();
-#ifdef HWPMC_HOOKS
 		if (pmc_hook && (PCPU_GET(curthread)->td_pflags & TDP_CALLCHAIN))
 			pmc_hook(PCPU_GET(curthread), PMC_FN_USER_CALLCHAIN, framep);
-#endif
 		critical_exit();
 		break;
+#endif
 
 	default:
 		/* Re-enable interrupts if applicable. */