Merge branch 'next' into for-linus

Prepare input updates for 4.14 merge window.

1 files changed, 1 insertions, 1 deletions

diff --git a/arch/x86/kernel/kvm.c b/arch/x86/kernel/kvm.c
index da5c09789984..43e10d6fdbed 100644
--- a/arch/x86/kernel/kvm.c
+++ b/arch/x86/kernel/kvm.c
@@ -161,8 +161,8 @@ void kvm_async_pf_task_wait(u32 token)
                          */
                         rcu_irq_exit();
                         native_safe_halt();
-                        rcu_irq_enter();
                         local_irq_disable();
+                        rcu_irq_enter();
                 }
         }
         if (!n.halted)