update sources to Ubuntu-4.15.0-97.98
(generated with debian/scripts/import-upstream-tag + some manual hunk drop) Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
parent
e83375c7a4
commit
92ecb0dc4a
@ -89,19 +89,6 @@ index 63edcfe5b5a4..971443af5b95 100644
|
|||||||
|
|
||||||
if (!kvmclock_periodic_sync)
|
if (!kvmclock_periodic_sync)
|
||||||
return;
|
return;
|
||||||
@@ -8095,11 +8093,9 @@ void kvm_arch_vcpu_postcreate(struct kvm_vcpu *vcpu)
|
|
||||||
|
|
||||||
void kvm_arch_vcpu_destroy(struct kvm_vcpu *vcpu)
|
|
||||||
{
|
|
||||||
- int r;
|
|
||||||
vcpu->arch.apf.msr_val = 0;
|
|
||||||
|
|
||||||
- r = vcpu_load(vcpu);
|
|
||||||
- BUG_ON(r);
|
|
||||||
+ vcpu_load(vcpu);
|
|
||||||
kvm_mmu_unload(vcpu);
|
|
||||||
vcpu_put(vcpu);
|
|
||||||
|
|
||||||
@@ -8479,9 +8475,7 @@ int kvm_arch_post_init_vm(struct kvm *kvm)
|
@@ -8479,9 +8475,7 @@ int kvm_arch_post_init_vm(struct kvm *kvm)
|
||||||
|
|
||||||
static void kvm_unload_vcpu_mmu(struct kvm_vcpu *vcpu)
|
static void kvm_unload_vcpu_mmu(struct kvm_vcpu *vcpu)
|
||||||
|
@ -1 +1 @@
|
|||||||
Subproject commit 957181d4406d115ade6ef9cbb1e3af875d56f510
|
Subproject commit 8561dd1286e60c2a33890df04a14af9279554bc3
|
Loading…
Reference in New Issue
Block a user