From: Sasha Levin <alexander.levin@microsoft.com>
Date: Tue, 20 Mar 2018 20:44:15 +0000 (-0400)
Subject: Revert "x86/retpoline/xen: Convert Xen hypercall indirect jumps"
X-Git-Tag: v4.1.51~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=996f7651f682994ea21bda0da07bf19590fa789d;p=thirdparty%2Fkernel%2Fstable.git

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 da45f9fc19139..4ad5a91aea794 100644
--- 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();