diff options
| author | Alex Shi <alex.shi@linaro.org> | 2018-02-01 12:02:38 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2018-02-01 12:02:38 +0800 |
| commit | 59e35359ec360b74e9013ccab84c19ce53db38f9 (patch) | |
| tree | f6c5cca3189d2140f23e7a71ee3f167c7e6f748e /arch/x86/crypto/crc32c-pcl-intel-asm_64.S | |
| parent | c210bc406de6a7993b8d7f30c28436be80de7694 (diff) | |
| parent | a40f2a595adfe0be6ced06fdb4c4a24ae3291a91 (diff) | |
Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-androidlsk-v4.4-18.02-android
Diffstat (limited to 'arch/x86/crypto/crc32c-pcl-intel-asm_64.S')
| -rw-r--r-- | arch/x86/crypto/crc32c-pcl-intel-asm_64.S | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/crypto/crc32c-pcl-intel-asm_64.S b/arch/x86/crypto/crc32c-pcl-intel-asm_64.S index 4fe27e074194..48767520cbe0 100644 --- a/arch/x86/crypto/crc32c-pcl-intel-asm_64.S +++ b/arch/x86/crypto/crc32c-pcl-intel-asm_64.S @@ -45,6 +45,7 @@ #include <asm/inst.h> #include <linux/linkage.h> +#include <asm/nospec-branch.h> ## ISCSI CRC 32 Implementation with crc32 and pclmulqdq Instruction @@ -172,7 +173,7 @@ continue_block: movzxw (bufp, %rax, 2), len offset=crc_array-jump_table lea offset(bufp, len, 1), bufp - jmp *bufp + JMP_NOSPEC bufp ################################################################ ## 2a) PROCESS FULL BLOCKS: |