diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-01 15:48:16 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-01 15:48:16 -0400 |
| commit | 84ff7a001270258f71d6ab0d164f351e32c9718a (patch) | |
| tree | 6b2f33a9ad492186062de247d3572fa5efebe4bd /arch/s390 | |
| parent | 478735e42bfa047384afa72dceb408035532db20 (diff) | |
| parent | 1f4170e12db06fdde5279d665a7e6e2976b2b623 (diff) | |
Merge branch 'kvm-updates-2.6.27' of git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm
* 'kvm-updates-2.6.27' of git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm:
KVM: s390: Fix kvm on IBM System z10
KVM: Advertise synchronized mmu support to userspace
KVM: Synchronize guest physical memory map to host virtual memory map
KVM: Allow browsing memslots with mmu_lock
KVM: Allow reading aliases with mmu_lock
Diffstat (limited to 'arch/s390')
| -rw-r--r-- | arch/s390/kvm/priv.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/s390/kvm/priv.c b/arch/s390/kvm/priv.c index 2e2d2ffb6a07..d1faf5c54405 100644 --- a/arch/s390/kvm/priv.c +++ b/arch/s390/kvm/priv.c | |||
| @@ -158,6 +158,7 @@ static int handle_stfl(struct kvm_vcpu *vcpu) | |||
| 158 | 158 | ||
| 159 | vcpu->stat.instruction_stfl++; | 159 | vcpu->stat.instruction_stfl++; |
| 160 | facility_list &= ~(1UL<<24); /* no stfle */ | 160 | facility_list &= ~(1UL<<24); /* no stfle */ |
| 161 | facility_list &= ~(1UL<<23); /* no large pages */ | ||
| 161 | 162 | ||
| 162 | rc = copy_to_guest(vcpu, offsetof(struct _lowcore, stfl_fac_list), | 163 | rc = copy_to_guest(vcpu, offsetof(struct _lowcore, stfl_fac_list), |
| 163 | &facility_list, sizeof(facility_list)); | 164 | &facility_list, sizeof(facility_list)); |