---

yaml --- r: 298891 b: refs/heads/master c: e087592 h: refs/heads/master i: 298889: 0e6eb0c 298887: b73fc4e v: v3
git-mirror · Apr 5, 2012 · 87c0a72 · 87c0a72
1 parent 1a81355
commit 87c0a72
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8a4032496f41d40d2d0272b887b7f4cbc0ea2186
+refs/heads/master: e08759215b7dcb7111e94f0f96918dd98e86ca6b
diff --git a/trunk/arch/x86/kernel/kvm.c b/trunk/arch/x86/kernel/kvm.c
@@ -38,6 +38,7 @@
 #include <asm/traps.h>
 #include <asm/desc.h>
 #include <asm/tlbflush.h>
+#include <asm/idle.h>
 
 static int kvmapf = 1;
 
@@ -253,7 +254,10 @@ do_async_page_fault(struct pt_regs *regs, unsigned long error_code)
 		kvm_async_pf_task_wait((u32)read_cr2());
 		break;
 	case KVM_PV_REASON_PAGE_READY:
+		rcu_irq_enter();
+		exit_idle();
 		kvm_async_pf_task_wake((u32)read_cr2());
+		rcu_irq_exit();
 		break;
 	}
 }