diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2018-08-02 07:57:29 -0400 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2018-08-02 07:57:29 -0400 |
| commit | 85eae57bbb0612387201635659be543aaac2109e (patch) | |
| tree | 87ab615194c224fd810076633ea03008c5a5c51b /include/linux | |
| parent | 3a1174cd3edbd6d822388ee1806669a9328872ce (diff) | |
| parent | 2375846193663a1282c0ef7093640ed3210dc09f (diff) | |
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 'include/linux')
| -rw-r--r-- | include/linux/kvm_host.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h index 4ee7bc548a83..5f138b40e433 100644 --- a/include/linux/kvm_host.h +++ b/include/linux/kvm_host.h | |||
| @@ -309,6 +309,13 @@ static inline unsigned long kvm_dirty_bitmap_bytes(struct kvm_memory_slot *memsl | |||
| 309 | return ALIGN(memslot->npages, BITS_PER_LONG) / 8; | 309 | return ALIGN(memslot->npages, BITS_PER_LONG) / 8; |
| 310 | } | 310 | } |
| 311 | 311 | ||
| 312 | static inline unsigned long *kvm_second_dirty_bitmap(struct kvm_memory_slot *memslot) | ||
| 313 | { | ||
| 314 | unsigned long len = kvm_dirty_bitmap_bytes(memslot); | ||
| 315 | |||
| 316 | return memslot->dirty_bitmap + len / sizeof(*memslot->dirty_bitmap); | ||
| 317 | } | ||
| 318 | |||
| 312 | struct kvm_s390_adapter_int { | 319 | struct kvm_s390_adapter_int { |
| 313 | u64 ind_addr; | 320 | u64 ind_addr; |
| 314 | u64 summary_addr; | 321 | u64 summary_addr; |
