Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSasha Levin <alexander.levin@microsoft.com>2018-03-26 21:34:18 -0400
committerSasha Levin <alexander.levin@microsoft.com>2018-03-26 21:34:18 -0400
commit9f63c2489c715b2e986517cc3c6fb9e5fcd6218e (patch)
tree350fc447fbe120bf9916ee036e7eecd5694cb5dd
parent2ae2efda4b14ad93415c2b9884cbac1ac9d0d794 (diff)
Revert "x86/retpoline/checksum32: Convert assembler indirect jumps"
This reverts commit 539142804971ee10ff0370d19d6e1ee5bc45babc. Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
-rw-r--r--arch/x86/lib/checksum_32.S7
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/x86/lib/checksum_32.S b/arch/x86/lib/checksum_32.S
index b7518368492a..9bc944a91274 100644
--- a/arch/x86/lib/checksum_32.S
+++ b/arch/x86/lib/checksum_32.S
@@ -29,8 +29,7 @@
#include <asm/dwarf2.h>
#include <asm/errno.h>
#include <asm/asm.h>
-#include <asm/nospec-branch.h>
-
+
/*
* computes a partial checksum, e.g. for TCP/UDP fragments
*/
@@ -160,7 +159,7 @@ ENTRY(csum_partial)
negl %ebx
lea 45f(%ebx,%ebx,2), %ebx
testl %esi, %esi
- JMP_NOSPEC %ebx
+ jmp *%ebx
# Handle 2-byte-aligned regions
20: addw (%esi), %ax
@@ -447,7 +446,7 @@ ENTRY(csum_partial_copy_generic)
andl $-32,%edx
lea 3f(%ebx,%ebx), %ebx
testl %esi, %esi
- JMP_NOSPEC %ebx
+ jmp *%ebx
1: addl $64,%esi
addl $64,%edi
SRC(movb -32(%edx),%bl) ; SRC(movb (%edx),%bl)