2 files changed, 17 insertions, 15 deletions

diff --git a/drivers/xen/events.c b/drivers/xen/events.c
index 13365ba35218..7d24b0d94ed4 100644
--- a/drivers/xen/events.c
+++ b/drivers/xen/events.c
@@ -338,30 +338,29 @@ static void unmask_evtchn(int port)
 
 static int find_unbound_irq(void)
 {
-        int irq;
-        struct irq_desc *desc;
+        struct irq_data *data;
+        int irq, res;
 
         for (irq = 0; irq < nr_irqs; irq++) {
-                desc = irq_to_desc(irq);
+                data = irq_get_irq_data(irq);
                 /* only 0->15 have init'd desc; handle irq > 16 */
-                if (desc == NULL)
+                if (!data)
                         break;
-                if (desc->chip == &no_irq_chip)
+                if (data->chip == &no_irq_chip)
                         break;
-                if (desc->chip != &xen_dynamic_chip)
+                if (data->chip != &xen_dynamic_chip)
                         continue;
                 if (irq_info[irq].type == IRQT_UNBOUND)
-                        break;
+                        return irq;
         }
 
         if (irq == nr_irqs)
                 panic("No available IRQ to bind to: increase nr_irqs!\n");
 
-        desc = irq_to_desc_alloc_node(irq, 0);
-        if (WARN_ON(desc == NULL))
-                return -1;
+        res = irq_alloc_desc_at(irq, 0);
 
-        dynamic_irq_init_keep_chip_data(irq);
+        if (WARN_ON(res != irq))
+                return -1;
 
         return irq;
 }
@@ -495,7 +494,7 @@ static void unbind_from_irq(unsigned int irq)
         if (irq_info[irq].type != IRQT_UNBOUND) {
                 irq_info[irq] = mk_unbound_info();
 
-                dynamic_irq_cleanup(irq);
+                irq_free_desc(irq);
         }
 
         spin_unlock(&irq_mapping_update_lock);
diff --git a/drivers/xen/xenbus/xenbus_probe.c b/drivers/xen/xenbus/xenbus_probe.c
index 29bac5118877..d409495876f1 100644
--- a/drivers/xen/xenbus/xenbus_probe.c
+++ b/drivers/xen/xenbus/xenbus_probe.c
@@ -755,7 +755,10 @@ int register_xenstore_notifier(struct notifier_block *nb)
 {
         int ret = 0;
 
-        blocking_notifier_chain_register(&xenstore_chain, nb);
+        if (xenstored_ready > 0)
+                ret = nb->notifier_call(nb, 0, NULL);
+        else
+                blocking_notifier_chain_register(&xenstore_chain, nb);
 
         return ret;
 }
@@ -769,7 +772,7 @@ EXPORT_SYMBOL_GPL(unregister_xenstore_notifier);
 
 void xenbus_probe(struct work_struct *unused)
 {
-        BUG_ON((xenstored_ready <= 0));
+        xenstored_ready = 1;
 
         /* Enumerate devices in xenstore and watch for changes. */
         xenbus_probe_devices(&xenbus_frontend);
@@ -835,8 +838,8 @@ static int __init xenbus_init(void)
                         xen_store_evtchn = xen_start_info->store_evtchn;
                         xen_store_mfn = xen_start_info->store_mfn;
                         xen_store_interface = mfn_to_virt(xen_store_mfn);
+                        xenstored_ready = 1;
                 }
-                xenstored_ready = 1;
         }
 
         /* Initialize the interface to xenstore. */