Skip to content

Commit db633a4

Browse files
thomashvmwIngo Molnar
authored andcommitted
x86/cpu/vmware: Use the full form of INL in VMWARE_HYPERCALL, for clang/llvm
LLVM's assembler doesn't accept the short form INL instruction: inl (%%dx) but instead insists on the output register to be explicitly specified. This was previously fixed for the VMWARE_PORT macro. Fix it also for the VMWARE_HYPERCALL macro. Suggested-by: Sami Tolvanen <[email protected]> Signed-off-by: Thomas Hellstrom <[email protected]> Reviewed-by: Nick Desaulniers <[email protected]> Cc: Borislav Petkov <[email protected]> Cc: H. Peter Anvin <[email protected]> Cc: Linus Torvalds <[email protected]> Cc: Peter Zijlstra <[email protected]> Cc: Sean Christopherson <[email protected]> Cc: Thomas Gleixner <[email protected]> Cc: [email protected] Fixes: b4dd4f6 ("Add a header file for hypercall definitions") Link: https://lkml.kernel.org/r/[email protected] Signed-off-by: Ingo Molnar <[email protected]>
1 parent 7d194c2 commit db633a4

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

arch/x86/include/asm/vmware.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@
2929

3030
/* The low bandwidth call. The low word of edx is presumed clear. */
3131
#define VMWARE_HYPERCALL \
32-
ALTERNATIVE_2("movw $" VMWARE_HYPERVISOR_PORT ", %%dx; inl (%%dx)", \
32+
ALTERNATIVE_2("movw $" VMWARE_HYPERVISOR_PORT ", %%dx; " \
33+
"inl (%%dx), %%eax", \
3334
"vmcall", X86_FEATURE_VMCALL, \
3435
"vmmcall", X86_FEATURE_VMW_VMMCALL)
3536

0 commit comments

Comments
 (0)