svn commit: r223570 - head/sys/powerpc/aim

[Nathan Whitehorn]

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 at ha
 	ld	%r2,tocbase at l(%r3)
 	addi	%r3,%r1,48
-	addi	%r4,%r1,-8		/* Clear any existing reservations */
-	stdcx.	%r3,0,%r4		
 	bl	CNAME(powerpc_interrupt)
 	nop