[Xen-changelog] Fix domU (by Kevin Tian)

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

# HG changeset patch
# User djm@xxxxxxxxxxxxxxx
# Node ID 7d81d6b8c302b10d205e3b6fa981294fd4e611de
# Parent  66dd96e90be4c2a66a98ed67ddd4ee8cec6bd599
Fix domU (by Kevin Tian)

diff -r 66dd96e90be4 -r 7d81d6b8c302 
linux-2.6-xen-sparse/arch/ia64/xen/drivers/evtchn_ia64.c
--- a/linux-2.6-xen-sparse/arch/ia64/xen/drivers/evtchn_ia64.c  Tue Nov  8 
02:40:31 2005
+++ b/linux-2.6-xen-sparse/arch/ia64/xen/drivers/evtchn_ia64.c  Tue Nov  8 
18:15:55 2005
@@ -35,14 +35,6 @@
        printk("bind_virq_to_irq called... FIXME??\n");
        while(1);
 }
-
-#if 0
-void notify_remote_via_irq(int virq)
-{
-       printk("notify_remote_via_irq called... FIXME??\n");
-       while(1);
-}
-#endif
 
 void unbind_virq_from_evtchn(int virq)
 {
@@ -91,10 +83,9 @@
 
 void notify_remote_via_irq(int irq)
 {
-       int evtchn = virq_to_evtchn[irq];       // FIXME... is this right??
-
-       if (VALID_EVTCHN(evtchn))
-               notify_remote_via_evtchn(evtchn);
+       /* IA64 has same irq value as event channel vector */
+       if (VALID_EVTCHN(irq))
+               notify_remote_via_evtchn(irq);
 }
 
 irqreturn_t evtchn_interrupt(int irq, void *dev_id, struct pt_regs *regs)
diff -r 66dd96e90be4 -r 7d81d6b8c302 
linux-2.6-xen-sparse/drivers/xen/blkback/interface.c
--- a/linux-2.6-xen-sparse/drivers/xen/blkback/interface.c      Tue Nov  8 
02:40:31 2005
+++ b/linux-2.6-xen-sparse/drivers/xen/blkback/interface.c      Tue Nov  8 
18:15:55 2005
@@ -50,6 +50,12 @@
 
        blkif->shmem_ref = shared_page;
        blkif->shmem_handle = op.handle;
+
+#ifdef __ia64__
+       /* on some arch's, map_grant_ref behaves like mmap, in that the
+        * passed address is a hint and a different address may be returned */
+       blkif->blk_ring_area->addr = gnttab_map_vaddr(op);
+#endif
 
        return 0;
 }

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