summaryrefslogtreecommitdiffstats
path: root/sys/powerpc
diff options
context:
space:
mode:
authornwhitehorn <nwhitehorn@FreeBSD.org>2011-06-26 15:08:14 +0000
committernwhitehorn <nwhitehorn@FreeBSD.org>2011-06-26 15:08:14 +0000
commita7d17981201bb7c35b2a46ada38b7a2d98ab4c5c (patch)
treeafdce851c0e4e10b8e88ff25385a35be158299ce /sys/powerpc
parent19f06d03447715735cf72299000ec43a2f3b495c (diff)
downloadFreeBSD-src-a7d17981201bb7c35b2a46ada38b7a2d98ab4c5c.zip
FreeBSD-src-a7d17981201bb7c35b2a46ada38b7a2d98ab4c5c.tar.gz
Revert r223479. It is unnecessary and served only to slightly ameliorate
some manifestations of the bug actually fixed in r223485.
Diffstat (limited to 'sys/powerpc')
-rw-r--r--sys/powerpc/aim/trap_subr32.S2
-rw-r--r--sys/powerpc/aim/trap_subr64.S2
2 files changed, 0 insertions, 4 deletions
diff --git a/sys/powerpc/aim/trap_subr32.S b/sys/powerpc/aim/trap_subr32.S
index f00020b..172150e 100644
--- a/sys/powerpc/aim/trap_subr32.S
+++ b/sys/powerpc/aim/trap_subr32.S
@@ -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):
diff --git a/sys/powerpc/aim/trap_subr64.S b/sys/powerpc/aim/trap_subr64.S
index 1ec8507..111d516 100644
--- a/sys/powerpc/aim/trap_subr64.S
+++ b/sys/powerpc/aim/trap_subr64.S
@@ -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
OpenPOWER on IntegriCloud