summaryrefslogtreecommitdiffstats
path: root/arch/sparc/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-10-18 09:30:41 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2014-10-18 09:30:41 -0700
commitffd8221bc348f8c282d1271883dbe629ea8ae289 (patch)
tree186cf97088b471362257bfecbe2c6495781fd594 /arch/sparc/include
parente0a9272c616838109fc5988ab154dc10670eb15e (diff)
parentf4da3628dc7c32a59d1fb7116bb042e6f436d611 (diff)
downloadtalos-obmc-linux-ffd8221bc348f8c282d1271883dbe629ea8ae289.tar.gz
talos-obmc-linux-ffd8221bc348f8c282d1271883dbe629ea8ae289.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
Pull Sparc bugfix from David Miller: "Sparc64 AES ctr mode bug fix" * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc: sparc64: Fix FPU register corruption with AES crypto offload.
Diffstat (limited to 'arch/sparc/include')
-rw-r--r--arch/sparc/include/asm/visasm.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/sparc/include/asm/visasm.h b/arch/sparc/include/asm/visasm.h
index b26673759283..1f0aa2024e94 100644
--- a/arch/sparc/include/asm/visasm.h
+++ b/arch/sparc/include/asm/visasm.h
@@ -39,6 +39,14 @@
297: wr %o5, FPRS_FEF, %fprs; \
298:
+#define VISEntryHalfFast(fail_label) \
+ rd %fprs, %o5; \
+ andcc %o5, FPRS_FEF, %g0; \
+ be,pt %icc, 297f; \
+ nop; \
+ ba,a,pt %xcc, fail_label; \
+297: wr %o5, FPRS_FEF, %fprs;
+
#define VISExitHalf \
wr %o5, 0, %fprs;
OpenPOWER on IntegriCloud