summaryrefslogtreecommitdiffstats
path: root/arch/sparc64/lib/VISsave.S
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-06-28 00:46:58 -0400
committerJeff Garzik <jgarzik@pobox.com>2005-06-28 00:46:58 -0400
commitd011e151bc5d1a581bf35b492a4fde44d30382b9 (patch)
treea912c745d3093127a767b7456c46c517bdc0baf7 /arch/sparc64/lib/VISsave.S
parent30b4d6565e4d57c6d03600c7822411c7cac19638 (diff)
parent2179a59db18ddf8eb3fd0133a3bee57f1c2b5b06 (diff)
downloadtalos-op-linux-d011e151bc5d1a581bf35b492a4fde44d30382b9.tar.gz
talos-op-linux-d011e151bc5d1a581bf35b492a4fde44d30382b9.zip
Merge /spare/repo/netdev-2.6 branch 'ieee80211'
Diffstat (limited to 'arch/sparc64/lib/VISsave.S')
-rw-r--r--arch/sparc64/lib/VISsave.S15
1 files changed, 13 insertions, 2 deletions
diff --git a/arch/sparc64/lib/VISsave.S b/arch/sparc64/lib/VISsave.S
index 65e328d600a8..4e18989bd602 100644
--- a/arch/sparc64/lib/VISsave.S
+++ b/arch/sparc64/lib/VISsave.S
@@ -72,7 +72,11 @@ vis1: ldub [%g6 + TI_FPSAVED], %g3
stda %f48, [%g3 + %g1] ASI_BLK_P
5: membar #Sync
- jmpl %g7 + %g0, %g0
+ ba,pt %xcc, 80f
+ nop
+
+ .align 32
+80: jmpl %g7 + %g0, %g0
nop
6: ldub [%g3 + TI_FPSAVED], %o5
@@ -87,8 +91,11 @@ vis1: ldub [%g6 + TI_FPSAVED], %g3
stda %f32, [%g2 + %g1] ASI_BLK_P
stda %f48, [%g3 + %g1] ASI_BLK_P
membar #Sync
- jmpl %g7 + %g0, %g0
+ ba,pt %xcc, 80f
+ nop
+ .align 32
+80: jmpl %g7 + %g0, %g0
nop
.align 32
@@ -126,6 +133,10 @@ VISenterhalf:
stda %f0, [%g2 + %g1] ASI_BLK_P
stda %f16, [%g3 + %g1] ASI_BLK_P
membar #Sync
+ ba,pt %xcc, 4f
+ nop
+
+ .align 32
4: and %o5, FPRS_DU, %o5
jmpl %g7 + %g0, %g0
wr %o5, FPRS_FEF, %fprs
OpenPOWER on IntegriCloud