[Xen-changelog] xen/ia64 with dom0 vp model doesn't need the blkbkack ia64 workarounds

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

# HG changeset patch
# User kaf24@xxxxxxxxxxxxxxxxxxxx
# Node ID 5931e98cd744e4cc49640a72967112669197b495
# Parent  eba70739741077c1d393862c3d9ba5b5b5a576b8
xen/ia64 with dom0 vp model doesn't need the blkbkack ia64 workarounds
any more.  xen/ia64 dom0 vp model is a big change so that xen/ia64
with the old model (P=M) still remains as the compile option.
Hopefully the work around will be eliminated in the future completely.

Signed-off-by: Isaku Yamahata <yamahata@xxxxxxxxxxxxx>

diff -r eba707397410 -r 5931e98cd744 
linux-2.6-xen-sparse/drivers/xen/blkback/blkback.c
--- a/linux-2.6-xen-sparse/drivers/xen/blkback/blkback.c        Fri Apr 28 
14:47:42 2006 +0100
+++ b/linux-2.6-xen-sparse/drivers/xen/blkback/blkback.c        Fri Apr 28 
14:48:50 2006 +0100
@@ -410,7 +410,7 @@ static void dispatch_rw_block_io(blkif_t
                }
 
                pending_handle(pending_req, i) = map[i].handle;
-#ifdef __ia64__
+#if defined(__ia64__) && !defined(CONFIG_XEN_IA64_DOM0_VP)
                pending_vaddrs[vaddr_pagenr(pending_req, i)] =
                        (unsigned long)gnttab_map_vaddr(map[i]);
 #else
@@ -546,7 +546,7 @@ static int __init blkif_init(void)
 
        blkif_interface_init();
        
-#ifdef __ia64__
+#if defined(__ia64__) && !defined(CONFIG_XEN_IA64_DOM0_VP)
        extern unsigned long alloc_empty_foreign_map_page_range(
                unsigned long pages);
        mmap_vstart = (unsigned long)
diff -r eba707397410 -r 5931e98cd744 
linux-2.6-xen-sparse/drivers/xen/blkback/interface.c
--- a/linux-2.6-xen-sparse/drivers/xen/blkback/interface.c      Fri Apr 28 
14:47:42 2006 +0100
+++ b/linux-2.6-xen-sparse/drivers/xen/blkback/interface.c      Fri Apr 28 
14:48:50 2006 +0100
@@ -74,7 +74,7 @@ static int map_frontend_page(blkif_t *bl
        blkif->shmem_ref = shared_page;
        blkif->shmem_handle = op.handle;
 
-#ifdef __ia64__
+#if defined(__ia64__) && !defined(CONFIG_XEN_IA64_DOM0_VP)
        /* 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);

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