diff --git a/[refs] b/[refs]
index ec93efd7976a..169d640127e5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e00c8cf29b9798eb9918469b0cce1766e0ae40d7
+refs/heads/master: 60395224d94945544f1f9dce5566981844bf0e77
diff --git a/trunk/drivers/kvm/kvm_main.c b/trunk/drivers/kvm/kvm_main.c
index a6e3165043d1..453e98e251da 100644
--- a/trunk/drivers/kvm/kvm_main.c
+++ b/trunk/drivers/kvm/kvm_main.c
@@ -993,6 +993,8 @@ struct page *gfn_to_page(struct kvm *kvm, gfn_t gfn)
 	struct page *page[1];
 	int npages;
 
+	might_sleep();
+
 	gfn = unalias_gfn(kvm, gfn);
 	slot = __gfn_to_memslot(kvm, gfn);
 	if (!slot) {