Revert "x86/retpoline/xen: Convert Xen hypercall indirect jumps"

This reverts commit 4cc996c64b97219945b28b9faa056c009d09c04d.

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

diff --git a/arch/x86/include/asm/xen/hypercall.h b/arch/x86/include/asm/xen/hypercall.h
index da45f9fc1913922f76c4acfa682c97e33622b393..4ad5a91aea7945fcd73e62766aac79698aec9c49 100644 (file)
--- a/arch/x86/include/asm/xen/hypercall.h
+++ b/arch/x86/include/asm/xen/hypercall.h
@@ -44,7 +44,6 @@
 #include <asm/page.h>
 #include <asm/pgtable.h>
 #include <asm/smap.h>
-#include <asm/nospec-branch.h>
 
 #include <xen/interface/xen.h>
 #include <xen/interface/sched.h>
@@ -216,9 +215,9 @@ privcmd_call(unsigned call,
        __HYPERCALL_5ARG(a1, a2, a3, a4, a5);
 
        stac();
-       asm volatile(CALL_NOSPEC
+       asm volatile("call *%[call]"
                     : __HYPERCALL_5PARAM
-                    : [thunk_target] "a" (&hypercall_page[call])
+                    : [call] "a" (&hypercall_page[call])
                     : __HYPERCALL_CLOBBER5);
        clac();