On Wed, Apr 18, 2018 at 11:18:24AM +0800, Youquan Song wrote: > From: Paolo Bonzini <pbonzini@xxxxxxxxxx> > > (cherry picked from commit f21f165ef922c2146cc5bdc620f542953c41714b) > > Group together the calls to alloc_vmcs and loaded_vmcs_init. Soon we'll also > allocate an MSR bitmap there. > > Cc: stable@xxxxxxxxxxxxxxx # prereq for Spectre mitigation > Signed-off-by: Paolo Bonzini <pbonzini@xxxxxxxxxx> > Signed-off-by: David Woodhouse <dwmw@xxxxxxxxxxxx> > Signed-off-by: Yi Sun <yi.y.sun@xxxxxxxxxxxxxxx> [v4.4 backport] > > Conflicts: > arch/x86/kvm/vmx.c And again...