Revert "x86/retpoline/checksum32: Convert assembler indirect jumps"

This reverts commit 539142804971ee10ff0370d19d6e1ee5bc45babc.

Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>

diff --git a/arch/x86/lib/checksum_32.S b/arch/x86/lib/checksum_32.S
index b7518368492a7a05ceda9ba6781e3840a1544e04..9bc944a9127481ead40689a73054d80e50f0bc10 100644 (file)
--- 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)