diff options
| author | Sasha Levin <alexander.levin@microsoft.com> | 2018-03-20 16:44:15 -0400 |
|---|---|---|
| committer | Sasha Levin <alexander.levin@microsoft.com> | 2018-03-20 23:49:54 -0400 |
| commit | 996f7651f682994ea21bda0da07bf19590fa789d (patch) | |
| tree | 574dd8a439e76c383721a3542ba34f5dfac474e6 /arch/x86 | |
| parent | e0e719352ac4c9c94c78cad538ad153afc28e5a8 (diff) | |
Revert "x86/retpoline/xen: Convert Xen hypercall indirect jumps"
This reverts commit 4cc996c64b97219945b28b9faa056c009d09c04d.
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/include/asm/xen/hypercall.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/x86/include/asm/xen/hypercall.h b/arch/x86/include/asm/xen/hypercall.h index da45f9fc1913..4ad5a91aea79 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(); |