diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2017-06-08 16:35:18 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2017-06-08 16:35:18 +0200 |
| commit | 9e53932d888b7f32475db72f859f8f38cc2135fb (patch) | |
| tree | 8a3da8df28b51ef3c604b8b24a5f9eb669dd3078 /arch/s390/include | |
| parent | a3641631d14571242eec0d30c9faa786cbf52d44 (diff) | |
| parent | 1ba15b24f07c44f68067959522639226c963e212 (diff) | |
Merge tag 'kvm-s390-master-4.12-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD
KVM: s390: Fix for master (4.12)
- The newly created AIS capability enables the feature unconditionally
and ignores the cpu model
Diffstat (limited to 'arch/s390/include')
| -rw-r--r-- | arch/s390/include/asm/kvm_host.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/s390/include/asm/kvm_host.h b/arch/s390/include/asm/kvm_host.h index 426614a882a9..65d07ac34647 100644 --- a/arch/s390/include/asm/kvm_host.h +++ b/arch/s390/include/asm/kvm_host.h @@ -541,7 +541,6 @@ struct kvm_s390_float_interrupt { struct mutex ais_lock; u8 simm; u8 nimm; - int ais_enabled; }; struct kvm_hw_wp_info_arch { |