diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2018-08-02 13:57:29 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2018-08-02 13:57:29 +0200 |
| commit | 85eae57bbb0612387201635659be543aaac2109e (patch) | |
| tree | 87ab615194c224fd810076633ea03008c5a5c51b /virt/kvm | |
| parent | 3a1174cd3edbd6d822388ee1806669a9328872ce (diff) | |
| parent | 2375846193663a1282c0ef7093640ed3210dc09f (diff) | |
| download | talos-obmc-linux-85eae57bbb0612387201635659be543aaac2109e.tar.gz talos-obmc-linux-85eae57bbb0612387201635659be543aaac2109e.zip | |
Merge tag 'kvm-s390-next-4.19-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD
KVM: s390: Features for 4.19
- initial version for host large page support. Must be enabled with
module parameter hpage=1 and will conflict with the nested=1
parameter.
- enable etoken facility for guests
- Fixes
Diffstat (limited to 'virt/kvm')
| -rw-r--r-- | virt/kvm/kvm_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index 8b47507faab5..f519eb8d06b1 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -1169,7 +1169,7 @@ int kvm_get_dirty_log_protect(struct kvm *kvm, n = kvm_dirty_bitmap_bytes(memslot); - dirty_bitmap_buffer = dirty_bitmap + n / sizeof(long); + dirty_bitmap_buffer = kvm_second_dirty_bitmap(memslot); memset(dirty_bitmap_buffer, 0, n); spin_lock(&kvm->mmu_lock); |
