Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6

[mv-sheeva.git] / drivers / xen / events.c

diff --git a/drivers/xen/events.c b/drivers/xen/events.c
index ce602dd09bc18c60381c68f0f1310bb168817bed..2f8413794d05b98b48558ac527af7c1c9d63c566 100644 (file)
--- 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);
+                               }
                        }
                }