From owner-svn-src-all@FreeBSD.ORG  Sun Jun 26 15:08:14 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id AD0B31065670;
	Sun, 26 Jun 2011 15:08:14 +0000 (UTC)
	(envelope-from nwhitehorn@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 9D71A8FC08;
	Sun, 26 Jun 2011 15:08:14 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p5QF8EHN057348;
	Sun, 26 Jun 2011 15:08:14 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Received: (from nwhitehorn@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p5QF8EDK057345;
	Sun, 26 Jun 2011 15:08:14 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Message-Id: <201106261508.p5QF8EDK057345@svn.freebsd.org>
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Sun, 26 Jun 2011 15:08:14 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r223570 - head/sys/powerpc/aim
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 26 Jun 2011 15:08:14 -0000

Author: nwhitehorn
Date: Sun Jun 26 15:08:14 2011
New Revision: 223570
URL: http://svn.freebsd.org/changeset/base/223570

Log:
  Revert r223479. It is unnecessary and served only to slightly ameliorate
  some manifestations of the bug actually fixed in r223485.

Modified:
  head/sys/powerpc/aim/trap_subr32.S
  head/sys/powerpc/aim/trap_subr64.S

Modified: head/sys/powerpc/aim/trap_subr32.S
==============================================================================
--- head/sys/powerpc/aim/trap_subr32.S	Sun Jun 26 14:29:49 2011	(r223569)
+++ head/sys/powerpc/aim/trap_subr32.S	Sun Jun 26 15:08:14 2011	(r223570)
@@ -754,8 +754,6 @@ k_trap:
 /* Call C interrupt dispatcher: */
 trapagain:
 	addi	%r3,%r1,8
-	addi	%r4,%r1,-4		/* Clear any existing reservations */
-	stwcx.	%r3,0,%r4		
 	bl	CNAME(powerpc_interrupt)
 	.globl	CNAME(trapexit)		/* backtrace code sentinel */
 CNAME(trapexit):

Modified: head/sys/powerpc/aim/trap_subr64.S
==============================================================================
--- head/sys/powerpc/aim/trap_subr64.S	Sun Jun 26 14:29:49 2011	(r223569)
+++ head/sys/powerpc/aim/trap_subr64.S	Sun Jun 26 15:08:14 2011	(r223570)
@@ -514,8 +514,6 @@ trapagain:
 	lis	%r3,tocbase@ha
 	ld	%r2,tocbase@l(%r3)
 	addi	%r3,%r1,48
-	addi	%r4,%r1,-8		/* Clear any existing reservations */
-	stdcx.	%r3,0,%r4		
 	bl	CNAME(powerpc_interrupt)
 	nop