2 files changed, 10 insertions, 6 deletions

diff --git a/drivers/xen/events.c b/drivers/xen/events.c
index ce602dd09bc1..2f8413794d05 100644
--- a/drivers/xen/events.c
+++ b/drivers/xen/events.c
@@ -649,9 +649,13 @@ void xen_evtchn_do_upcall(struct pt_regs *regs)
                                 int bit_idx = __ffs(pending_bits);
                                 int port = (word_idx * BITS_PER_LONG) + bit_idx;
                                 int irq = evtchn_to_irq[port];
+                                struct irq_desc *desc;
 
-                                if (irq != -1)
-                                        handle_irq(irq, regs);
+                                if (irq != -1) {
+                                        desc = irq_to_desc(irq);
+                                        if (desc)
+                                                generic_handle_irq_desc(irq, desc);
+                                }
                         }
                 }
 
diff --git a/drivers/xen/manage.c b/drivers/xen/manage.c
index c4997930afc7..5d42d55e299b 100644
--- a/drivers/xen/manage.c
+++ b/drivers/xen/manage.c
@@ -102,15 +102,15 @@ static void do_suspend(void)
                 goto out_thaw;
         }
 
+        printk(KERN_DEBUG "suspending xenstore...\n");
+        xs_suspend();
+
         err = dpm_suspend_noirq(PMSG_SUSPEND);
         if (err) {
                 printk(KERN_ERR "dpm_suspend_noirq failed: %d\n", err);
                 goto out_resume;
         }
 
-        printk(KERN_DEBUG "suspending xenstore...\n");
-        xs_suspend();
-
         err = stop_machine(xen_suspend, &cancelled, cpumask_of(0));
 
         dpm_resume_noirq(PMSG_RESUME);
@@ -120,13 +120,13 @@ static void do_suspend(void)
                 cancelled = 1;
         }
 
+out_resume:
         if (!cancelled) {
                 xen_arch_resume();
                 xs_resume();
         } else
                 xs_suspend_cancel();
 
-out_resume:
         dpm_resume_end(PMSG_RESUME);
 
         /* Make sure timer events get retriggered on all CPUs */