From b27640088107834832ea6d58b5968ee1b81a6e80 Mon Sep 17 00:00:00 2001
From: Mojiong Qiu <qiumojiong@gmail.com>
Date: Tue, 6 Nov 2012 16:08:15 +0800
Subject: [PATCH] --- yaml --- r: 335550 b: refs/heads/master c:
 772aebcefeff310f80e32b874988af0076cb799d h: refs/heads/master v: v3

---
 [refs]                     | 2 +-
 trunk/drivers/xen/events.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 9753e9634610..440f22108fd4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6d877e6b85691e0b2b22e90aeb9b86c3dafcfc6b
+refs/heads/master: 772aebcefeff310f80e32b874988af0076cb799d
diff --git a/trunk/drivers/xen/events.c b/trunk/drivers/xen/events.c
index 912ac81b6dbf..0be4df39e953 100644
--- a/trunk/drivers/xen/events.c
+++ b/trunk/drivers/xen/events.c
@@ -1395,10 +1395,10 @@ void xen_evtchn_do_upcall(struct pt_regs *regs)
 {
 	struct pt_regs *old_regs = set_irq_regs(regs);
 
+	irq_enter();
 #ifdef CONFIG_X86
 	exit_idle();
 #endif
-	irq_enter();
 
 	__xen_evtchn_do_upcall();