# HG changeset patch
# User yamahata@xxxxxxxxxxxxx
# Node ID bf8345ac3d7c5828d2dfe33335ec275e2eb222d6
# Parent  6c2ab5cfca56255320c82a36ebc35ad31d3951d5
introduce XEN_IA64_DOM0_NON_VP to simplify some ifdefs
from defined(__ia64__) && !defined(CONFIG_XEN_IA64_DOM0_VP)
to defined(XEN_IA64_DOM0_NON_VP).

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

diff -r 6c2ab5cfca56 -r bf8345ac3d7c linux-2.6-xen-sparse/arch/ia64/Kconfig
--- a/linux-2.6-xen-sparse/arch/ia64/Kconfig	Sat Apr 29 13:19:39 2006 +0900
+++ b/linux-2.6-xen-sparse/arch/ia64/Kconfig	Sat Apr 29 14:24:10 2006 +0900
@@ -90,11 +90,18 @@ config XEN_BLKDEV_BACKEND
 	default y
 
 config XEN_IA64_DOM0_VP
+	bool "dom0 vp model"
 	depends on XEN
-	bool
 	default n
 	help
 	  dom0 vp model
+
+config XEN_IA64_DOM0_NON_VP
+	bool
+	depends on !(XEN && XEN_IA64_DOM0_VP)
+	default y
+	help
+	  dom0 P=M model
 
 config XEN_SYSFS
 	bool "Export Xen attributes in sysfs"
diff -r 6c2ab5cfca56 -r bf8345ac3d7c linux-2.6-xen-sparse/drivers/xen/blkback/blkback.c
--- a/linux-2.6-xen-sparse/drivers/xen/blkback/blkback.c	Sat Apr 29 13:19:39 2006 +0900
+++ b/linux-2.6-xen-sparse/drivers/xen/blkback/blkback.c	Sat Apr 29 14:24:10 2006 +0900
@@ -410,7 +410,7 @@ static void dispatch_rw_block_io(blkif_t
 		}
 
 		pending_handle(pending_req, i) = map[i].handle;
-#if defined(__ia64__) && !defined(CONFIG_XEN_IA64_DOM0_VP)
+#ifdef CONFIG_XEN_IA64_DOM0_NON_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();
 	
-#if defined(__ia64__) && !defined(CONFIG_XEN_IA64_DOM0_VP)
+#ifdef CONFIG_XEN_IA64_DOM0_NON_VP
 	extern unsigned long alloc_empty_foreign_map_page_range(
 		unsigned long pages);
 	mmap_vstart = (unsigned long)
diff -r 6c2ab5cfca56 -r bf8345ac3d7c linux-2.6-xen-sparse/drivers/xen/blkback/interface.c
--- a/linux-2.6-xen-sparse/drivers/xen/blkback/interface.c	Sat Apr 29 13:19:39 2006 +0900
+++ b/linux-2.6-xen-sparse/drivers/xen/blkback/interface.c	Sat Apr 29 14:24:10 2006 +0900
@@ -74,7 +74,7 @@ static int map_frontend_page(blkif_t *bl
 	blkif->shmem_ref = shared_page;
 	blkif->shmem_handle = op.handle;
 
-#if defined(__ia64__) && !defined(CONFIG_XEN_IA64_DOM0_VP)
+#ifdef CONFIG_XEN_IA64_DOM0_NON_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);