diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-11-29 01:11:24 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-11-29 01:11:24 -0500 |
| commit | 4fc31ba13d052c2933bf91095c063cf9a39effd0 (patch) | |
| tree | beabb73c2fe245e6541126732895da62e55bc8ee /include/linux/hypervisor.h | |
| parent | 0e18dd12064e07519f7cbff4149ca7fff620cbed (diff) | |
| parent | b29c6ef7bb1257853c1e31616d84f55e561cf631 (diff) | |
Merge branch 'linus' into perf/urgent, to pick up dependent commits
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/linux/hypervisor.h')
| -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 @@ | |||
| 7 | * Juergen Gross <jgross@suse.com> | 7 | * Juergen Gross <jgross@suse.com> |
| 8 | */ | 8 | */ |
| 9 | 9 | ||
| 10 | #ifdef CONFIG_HYPERVISOR_GUEST | 10 | #ifdef CONFIG_X86 |
| 11 | #include <asm/hypervisor.h> | 11 | #include <asm/x86_init.h> |
| 12 | static inline void hypervisor_pin_vcpu(int cpu) | ||
| 13 | { | ||
| 14 | x86_platform.hyper.pin_vcpu(cpu); | ||
| 15 | } | ||
| 12 | #else | 16 | #else |
| 13 | static inline void hypervisor_pin_vcpu(int cpu) | 17 | static inline void hypervisor_pin_vcpu(int cpu) |
| 14 | { | 18 | { |