The following commit has been merged into the x86/urgent branch of tip: Commit-ID: b547c1fa97b030ac50586e8b187571b4a83d154c Gitweb: https://git.kernel.org/tip/b547c1fa97b030ac50586e8b187571b4a83d154c Author: Sami Tolvanen <samitolva...@google.com> AuthorDate: Mon, 07 Oct 2019 12:21:29 -07:00 Committer: Borislav Petkov <b...@suse.de> CommitterDate: Tue, 08 Oct 2019 11:52:35 +02:00
x86/cpu/vmware: Use the full form of inl in VMWARE_PORT LLVM's assembler doesn't accept the short form inl (%%dx) instruction, but instead insists on the output register to be explicitly specified: <inline asm>:1:7: error: invalid operand for instruction inl (%dx) ^ LLVM ERROR: Error parsing inline asm Use the full form of the instruction to fix the build. Signed-off-by: Sami Tolvanen <samitolva...@google.com> Signed-off-by: Borislav Petkov <b...@suse.de> Reviewed-by: Nick Desaulniers <ndesaulni...@google.com> Reviewed-by: Kees Cook <keesc...@chromium.org> Acked-by: Thomas Hellstrom <thellst...@vmware.com> Cc: clang-built-li...@googlegroups.com Cc: "H. Peter Anvin" <h...@zytor.com> Cc: Ingo Molnar <mi...@redhat.com> Cc: Thomas Gleixner <t...@linutronix.de> Cc: virtualizat...@lists.linux-foundation.org Cc: "VMware, Inc." <pv-driv...@vmware.com> Cc: x86-ml <x...@kernel.org> Link: https://github.com/ClangBuiltLinux/linux/issues/734 Link: https://lkml.kernel.org/r/20191007192129.104336-1-samitolva...@google.com --- arch/x86/kernel/cpu/vmware.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/kernel/cpu/vmware.c b/arch/x86/kernel/cpu/vmware.c index 9735139..46d7326 100644 --- a/arch/x86/kernel/cpu/vmware.c +++ b/arch/x86/kernel/cpu/vmware.c @@ -49,7 +49,7 @@ #define VMWARE_CMD_VCPU_RESERVED 31 #define VMWARE_PORT(cmd, eax, ebx, ecx, edx) \ - __asm__("inl (%%dx)" : \ + __asm__("inl (%%dx), %%eax" : \ "=a"(eax), "=c"(ecx), "=d"(edx), "=b"(ebx) : \ "a"(VMWARE_HYPERVISOR_MAGIC), \ "c"(VMWARE_CMD_##cmd), \