diff options
| author |   Ingo Molnar <mingo@kernel.org> | 2017-12-01 10:34:04 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-12-17 13:50:01 +0100 |
| commit | e5d77a73f364ba0e3e3d6c72c334324bb12e04fc (patch) | |
| tree | a3feefe8605f022dd974fbaddb10c7b992c58408 /include | |
| parent | Merge branch 'upstream-acpi-fixes' into WIP.x86/pti.base (diff) | |
| parent | x86/virt: Add enum for hypervisors to replace x86_hyper (diff) | |
| download | linux-dev-e5d77a73f364ba0e3e3d6c72c334324bb12e04fc.tar.xz linux-dev-e5d77a73f364ba0e3e3d6c72c334324bb12e04fc.zip | |
Merge commit 'upstream-x86-virt' into WIP.x86/mm
Merge a minimal set of virt cleanups, for a base for the MM isolation patches.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/hypervisor.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/include/linux/hypervisor.h b/include/linux/hypervisor.h index b4054fd5b6f6..b19563f9a8eb 100644 --- a/include/linux/hypervisor.h +++ b/include/linux/hypervisor.h @@ -7,8 +7,12 @@ * Juergen Gross <jgross@suse.com> */ -#ifdef CONFIG_HYPERVISOR_GUEST -#include <asm/hypervisor.h> +#ifdef CONFIG_X86 +#include <asm/x86_init.h> +static inline void hypervisor_pin_vcpu(int cpu) +{ + x86_platform.hyper.pin_vcpu(cpu); +} #else static inline void hypervisor_pin_vcpu(int cpu) { |