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 /arch/x86/kernel/kvm.c | |
| parent | 2ec077c186a02c0aae8fc213a7b1d4c35f9626ed (diff) | |
| parent | 03b2a320b19f1424e9ac9c21696be9c60b6d0d93 (diff) | |
| download | linux-e5d77a73f364ba0e3e3d6c72c334324bb12e04fc.tar.bz2 | |
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 'arch/x86/kernel/kvm.c')
| -rw-r--r-- | arch/x86/kernel/kvm.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/kernel/kvm.c b/arch/x86/kernel/kvm.c index 8bb9594d0761..a94de09edbed 100644 --- a/arch/x86/kernel/kvm.c +++ b/arch/x86/kernel/kvm.c @@ -544,12 +544,12 @@ static uint32_t __init kvm_detect(void) return kvm_cpuid_base(); } -const struct hypervisor_x86 x86_hyper_kvm __refconst = { +const __initconst struct hypervisor_x86 x86_hyper_kvm = { .name = "KVM", .detect = kvm_detect, - .x2apic_available = kvm_para_available, + .type = X86_HYPER_KVM, + .init.x2apic_available = kvm_para_available, }; -EXPORT_SYMBOL_GPL(x86_hyper_kvm); static __init int activate_jump_labels(void) { |