diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-10-30 18:39:02 +0000 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-10-30 18:39:02 +0000 |
commit | 31271e9aacaa3c3460cbad8ec62fb5a04a522f5b (patch) | |
tree | 815c671dac14e0e07959dc88e94c36a994f9c460 /arch/x86/kernel/kvm.c | |
parent | 32111abb508424d1d110fa471d940160abe251f5 (diff) | |
parent | dc4dc36056392c0b0b1ca9e81bebff964b9297e0 (diff) |
Merge branch 'spi-tegra' into spi-next
Diffstat (limited to 'arch/x86/kernel/kvm.c')
-rw-r--r-- | arch/x86/kernel/kvm.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/x86/kernel/kvm.c b/arch/x86/kernel/kvm.c index b3e5e51bc90..4180a874c76 100644 --- a/arch/x86/kernel/kvm.c +++ b/arch/x86/kernel/kvm.c @@ -247,7 +247,10 @@ do_async_page_fault(struct pt_regs *regs, unsigned long error_code) break; case KVM_PV_REASON_PAGE_NOT_PRESENT: /* page is swapped out by the host. */ + rcu_irq_enter(); + exit_idle(); kvm_async_pf_task_wait((u32)read_cr2()); + rcu_irq_exit(); break; case KVM_PV_REASON_PAGE_READY: rcu_irq_enter(); |