xen/arm: receive Xen events through PPI 31

Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>

diff --git a/arch/arm/common/gic.c b/arch/arm/common/gic.c
index 410a546060a2eecf82859d76c528223e8796f9f4..b46a89dfd525bf20d9f822d139bb82514b393a11 100644 (file)
--- a/arch/arm/common/gic.c
+++ b/arch/arm/common/gic.c
@@ -316,7 +316,7 @@ static void __init gic_dist_init(struct gic_chip_data *gic)
                        irq_set_percpu_devid(irq);
                        irq_set_chip_and_handler(irq, &gic_chip,
                                                 handle_percpu_devid_irq);
-                       set_irq_flags(irq, IRQF_VALID | IRQF_NOAUTOEN);
+                       set_irq_flags(irq, IRQF_VALID | IRQF_PROBE);
                } else {
                        irq_set_chip_and_handler(irq, &gic_chip,
                                                 handle_fasteoi_irq);

diff --git a/drivers/xen/events.c b/drivers/xen/events.c
index 18139ee7f3caf4be02744da2f0582a62f9d24cc8..eae0d0bbb0c1419011275d8cca7464533ecfb657 100644 (file)
--- a/drivers/xen/events.c
+++ b/drivers/xen/events.c
@@ -1732,7 +1732,7 @@ void __init xen_init_IRQ(void)
 #endif
 }
 #ifdef CONFIG_ARM
-#define IRQ_EVTCHN_CALLBACK 63
+#define IRQ_EVTCHN_CALLBACK 31
 irqreturn_t xen_arm_callback(int irq, void *arg)
 {
        __xen_evtchn_do_upcall();
@@ -1743,9 +1743,8 @@ int __init xen_init_IRQ_arm(void)
 {
        int rc;
        xen_init_IRQ();
-       rc = request_irq(IRQ_EVTCHN_CALLBACK, xen_arm_callback,
-                       IRQF_DISABLED | IRQF_NOBALANCING | IRQF_TRIGGER_RISING,
-                       "events", "events");    
+       rc = request_percpu_irq(IRQ_EVTCHN_CALLBACK, xen_arm_callback,
+                       "events", xen_vcpu);
        if (rc) {
                printk(KERN_ERR "Error requesting IRQ %d\n", IRQ_EVTCHN_CALLBACK);
        }