Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master

1 files changed, 10 insertions, 2 deletions

diff --git a/drivers/xen/events.c b/drivers/xen/events.c
index 2f57276e87a2..db8f506817f0 100644
--- a/drivers/xen/events.c
+++ b/drivers/xen/events.c
@@ -27,6 +27,7 @@
 #include <linux/module.h>
 #include <linux/string.h>
 #include <linux/bootmem.h>
+#include <linux/slab.h>
 
 #include <asm/ptrace.h>
 #include <asm/irq.h>
@@ -474,6 +475,9 @@ static void unbind_from_irq(unsigned int irq)
                 bind_evtchn_to_cpu(evtchn, 0);
 
                 evtchn_to_irq[evtchn] = -1;
+        }
+
+        if (irq_info[irq].type != IRQT_UNBOUND) {
                 irq_info[irq] = mk_unbound_info();
 
                 dynamic_irq_cleanup(irq);
@@ -646,9 +650,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);
+                                }
                         }
                 }