summaryrefslogtreecommitdiff
path: root/arch/x86/include
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2021-11-16 16:08:19 +0300
committerPaolo Bonzini <pbonzini@redhat.com>2021-11-18 10:11:57 +0300
commit817506df9dbaacf360e518d9ef26ca4075bbbacd (patch)
tree28a60fdbb779419d9f0e74380fd78dbceb2049ca /arch/x86/include
parente5bc4d4602b8e0e63c9d00d210120d6bcfaea590 (diff)
parent8e38e96a4e616ed0936faa964ceeb5d390b6425e (diff)
downloadlinux-817506df9dbaacf360e518d9ef26ca4075bbbacd.tar.xz
Merge branch 'kvm-5.16-fixes' into kvm-master
* Fixes for Xen emulation * Kill kvm_map_gfn() / kvm_unmap_gfn() and broken gfn_to_pfn_cache * Fixes for migration of 32-bit nested guests on 64-bit hypervisor * Compilation fixes * More SEV cleanups
Diffstat (limited to 'arch/x86/include')
-rw-r--r--arch/x86/include/asm/kvm_host.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h
index e5d8700319cc..6ac61f85e07b 100644
--- a/arch/x86/include/asm/kvm_host.h
+++ b/arch/x86/include/asm/kvm_host.h
@@ -363,6 +363,7 @@ union kvm_mmu_extended_role {
unsigned int cr4_smap:1;
unsigned int cr4_smep:1;
unsigned int cr4_la57:1;
+ unsigned int efer_lma:1;
};
};