diff options
| author | Mark Brown <broonie@kernel.org> | 2018-06-01 11:40:46 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-06-01 11:40:46 +0100 |
| commit | 1e82572e5f806782cc1bf06e6d22905c28b0a9f5 (patch) | |
| tree | c428a640fca2ee5c6bfe259482b941f5e0ece927 /arch/s390/crypto/crc32be-vx.S | |
| parent | 29e8549d35499289ce6211a553f956a2ab9a3905 (diff) | |
| parent | 86a04ba0955e3c806ed301cf178f1e130f1cb785 (diff) | |
Merge branch 'linux-linaro-lsk-v4.9' into linux-linaro-lsk-v4.9-rtlsk-v4.9-18.05-rt
Diffstat (limited to 'arch/s390/crypto/crc32be-vx.S')
| -rw-r--r-- | arch/s390/crypto/crc32be-vx.S | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/s390/crypto/crc32be-vx.S b/arch/s390/crypto/crc32be-vx.S index 8013989cd2e5..096affb74446 100644 --- a/arch/s390/crypto/crc32be-vx.S +++ b/arch/s390/crypto/crc32be-vx.S @@ -12,6 +12,7 @@ */ #include <linux/linkage.h> +#include <asm/nospec-insn.h> #include <asm/vx-insn.h> /* Vector register range containing CRC-32 constants */ @@ -66,6 +67,8 @@ .previous + GEN_BR_THUNK %r14 + .text /* * The CRC-32 function(s) use these calling conventions: @@ -202,6 +205,6 @@ ENTRY(crc32_be_vgfm_16) .Ldone: VLGVF %r2,%v2,3 - br %r14 + BR_EX %r14 .previous |