---

yaml --- r: 202233 b: refs/heads/master c: 08acfa1 h: refs/heads/master i: 202231: 1cbe2f5 v: v3
git-mirror · Aug 1, 2010 · 6511526 · 6511526
1 parent 65b53d2
commit 6511526
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 914ebccd2d8fa439e01fe93b5229534b9e179a69
+refs/heads/master: 08acfa187117046f8b5044b4a4cdc910f3ceeeb5
diff --git a/trunk/arch/x86/kvm/kvm_cache_regs.h b/trunk/arch/x86/kvm/kvm_cache_regs.h
@@ -36,6 +36,8 @@ static inline void kvm_rip_write(struct kvm_vcpu *vcpu, unsigned long val)
 
 static inline u64 kvm_pdptr_read(struct kvm_vcpu *vcpu, int index)
 {
+	might_sleep();  /* on svm */
+
 	if (!test_bit(VCPU_EXREG_PDPTR,
 		      (unsigned long *)&vcpu->arch.regs_avail))
 		kvm_x86_ops->cache_reg(vcpu, VCPU_EXREG_PDPTR);