git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branches 'asoc/topic/cs35l32', 'asoc/topic/cs35l34', 'asoc...
[sfrench/cifs-2.6.git]
/
arch
/
x86
/
crypto
/
camellia-aesni-avx2-asm_64.S
diff --git
a/arch/x86/crypto/camellia-aesni-avx2-asm_64.S
b/arch/x86/crypto/camellia-aesni-avx2-asm_64.S
index eee5b3982cfd3c6838a9a34534409df8935eba17..b66bbfa62f50d7c05ddb29b57a322979f64a6999 100644
(file)
--- a/
arch/x86/crypto/camellia-aesni-avx2-asm_64.S
+++ b/
arch/x86/crypto/camellia-aesni-avx2-asm_64.S
@@
-12,6
+12,7
@@
#include <linux/linkage.h>
#include <asm/frame.h>
+#include <asm/nospec-branch.h>
#define CAMELLIA_TABLE_BYTE_LEN 272
@@
-1343,7
+1344,7
@@
camellia_xts_crypt_32way:
vpxor 14 * 32(%rax), %ymm15, %ymm14;
vpxor 15 * 32(%rax), %ymm15, %ymm15;
-
call *
%r9;
+
CALL_NOSPEC
%r9;
addq $(16 * 32), %rsp;