From 607387e62746d33bcb1b07bf86eb42d1dae810e0 Mon Sep 17 00:00:00 2001
From: Andrea Arcangeli <andrea@qumranet.com>
Date: Wed, 30 Jan 2008 19:57:35 +0100
Subject: [PATCH] --- yaml --- r: 93780 b: refs/heads/master c:
 0aac03f07b37da96e00371e66973d5ffaae578a4 h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/virt/kvm/kvm_main.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 24f4f509027d..77ac0d6aec97 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 31bb117eb48f2629e030ca547ca89a1c34150183
+refs/heads/master: 0aac03f07b37da96e00371e66973d5ffaae578a4
diff --git a/trunk/virt/kvm/kvm_main.c b/trunk/virt/kvm/kvm_main.c
index 7972e3aa2cae..cf6df5167af6 100644
--- a/trunk/virt/kvm/kvm_main.c
+++ b/trunk/virt/kvm/kvm_main.c
@@ -554,7 +554,9 @@ int kvm_read_guest_atomic(struct kvm *kvm, gpa_t gpa, void *data,
 	addr = gfn_to_hva(kvm, gfn);
 	if (kvm_is_error_hva(addr))
 		return -EFAULT;
+	pagefault_disable();
 	r = __copy_from_user_inatomic(data, (void __user *)addr + offset, len);
+	pagefault_enable();
 	if (r)
 		return -EFAULT;
 	return 0;