[Xen-changelog] Merged.

[Xen patchbot -unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User emellor@ewan
# Node ID d443f03f8be0f40af055543bf3c1ae46aac4d23e
# Parent  70d5bfbf23d4c7ba21b4029ad63471959f854b86
# Parent  9d047fb99e388fa48d50b22e58884a133051d260
Merged.

diff -r 70d5bfbf23d4 -r d443f03f8be0 
linux-2.6-xen-sparse/drivers/xen/console/xencons_ring.c
--- a/linux-2.6-xen-sparse/drivers/xen/console/xencons_ring.c   Sun Oct  2 
17:22:22 2005
+++ b/linux-2.6-xen-sparse/drivers/xen/console/xencons_ring.c   Sun Oct  2 
17:24:41 2005
@@ -65,7 +65,8 @@
 int xencons_ring_send(const char *data, unsigned len)
 {
        int sent = __xencons_ring_send(outring(), data, len);
-       notify_remote_via_irq(xencons_irq);
+       /* Use evtchn: this is called early, before irq is set up. */
+       notify_remote_via_evtchn(xen_start_info->console_evtchn);
        return sent;
 }      
 
diff -r 70d5bfbf23d4 -r d443f03f8be0 
linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_comms.c
--- a/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_comms.c    Sun Oct  2 
17:22:22 2005
+++ b/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_comms.c    Sun Oct  2 
17:24:41 2005
@@ -147,7 +147,7 @@
                data += avail;
                len -= avail;
                update_output_chunk(out, avail);
-               notify_remote_via_irq(xenbus_irq);
+               notify_remote_via_evtchn(xen_start_info->store_evtchn);
        } while (len != 0);
 
        return 0;
@@ -192,7 +192,7 @@
                pr_debug("Finished read of %i bytes (%i to go)\n", avail, len);
                /* If it was full, tell them we've taken some. */
                if (was_full)
-                       notify_remote_via_irq(xenbus_irq);
+                       notify_remote_via_evtchn(xen_start_info->store_evtchn);
        }
 
        /* If we left something, wake watch thread to deal with it. */

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog