# HG changeset patch
# User yamahata@xxxxxxxxxxxxx
# Node ID bce6df7ec0284fc860df5f17f8136c8039dbe261
# Parent  d61271ca62a33eb2b6ece118f538813c1d67042e
xen/ia64 with dom0 vp model doesn't need the work around of blkback anymore.
ifndef them out.
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.
PATCHNAME: blkback_work_around_for_xen_ia64

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

diff -r d61271ca62a3 -r bce6df7ec028 linux-2.6-xen-sparse/drivers/xen/blkback/blkback.c
--- a/linux-2.6-xen-sparse/drivers/xen/blkback/blkback.c	Fri Apr 28 11:10:21 2006 +0900
+++ b/linux-2.6-xen-sparse/drivers/xen/blkback/blkback.c	Fri Apr 28 11:10:23 2006 +0900
@@ -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 d61271ca62a3 -r bce6df7ec028 linux-2.6-xen-sparse/drivers/xen/blkback/interface.c
--- a/linux-2.6-xen-sparse/drivers/xen/blkback/interface.c	Fri Apr 28 11:10:21 2006 +0900
+++ b/linux-2.6-xen-sparse/drivers/xen/blkback/interface.c	Fri Apr 28 11:10:23 2006 +0900
@@ -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);