x86/cpu/vmware: Fix platform detection VMWARE_PORT macro
authorThomas Hellstrom <thellstrom@vmware.com>
Mon, 21 Oct 2019 17:24:03 +0000 (19:24 +0200)
committerIngo Molnar <mingo@kernel.org>
Mon, 21 Oct 2019 22:51:44 +0000 (00:51 +0200)
commit6fee2a0be0ecae939d4b6cd8297d88b5cbb61654
treef740c0d3953187ef571f65414673bec662fc5cd3
parentdb633a4e0e6eda69b6065e3e106f9ea13a0676c3
x86/cpu/vmware: Fix platform detection VMWARE_PORT macro

The platform detection VMWARE_PORT macro uses the VMWARE_HYPERVISOR_PORT
definition, but expects it to be an integer. However, when it was moved
to the new vmware.h include file, it was changed to be a string to better
fit into the VMWARE_HYPERCALL set of macros. This obviously breaks the
platform detection VMWARE_PORT functionality.

Change the VMWARE_HYPERVISOR_PORT and VMWARE_HYPERVISOR_PORT_HB
definitions to be integers, and use __stringify() for their stringified
form when needed.

Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Cc: Borislav Petkov <bp@suse.de>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Sean Christopherson <sean.j.christopherson@intel.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Fixes: b4dd4f6e3648 ("Add a header file for hypercall definitions")
Link: https://lkml.kernel.org/r/20191021172403.3085-3-thomas_os@shipmail.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
arch/x86/include/asm/vmware.h