diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-06-15 00:36:54 (GMT) |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-06-15 00:36:54 (GMT) |
| commit | 7dafd239ab522d38979ebe44d79aa68ad7b1a383 (patch) | |
| tree | 04754a0c6495e57c1fe5f417fbfc99272d353c0e /arch/s390/kvm/kvm-s390.c | |
| parent | bc47ab0241c7c86da4f5e5f82fbca7d45387c18d (diff) | |
| parent | 45e3e1935e2857c54783291107d33323b3ef33c8 (diff) | |
| download | linux-7dafd239ab522d38979ebe44d79aa68ad7b1a383.tar.xz | |
Merge commit 'origin/master' into next
Diffstat (limited to 'arch/s390/kvm/kvm-s390.c')
| -rw-r--r-- | arch/s390/kvm/kvm-s390.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c index 10bccd1..c18b21d 100644 --- a/arch/s390/kvm/kvm-s390.c +++ b/arch/s390/kvm/kvm-s390.c @@ -512,7 +512,7 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run) BUG(); } - might_sleep(); + might_fault(); do { __vcpu_run(vcpu); |