[Xen-changelog] Introduce XEN_IA64_DOM0_NON_VP to simplify some ifdefs

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

# HG changeset patch
# User kaf24@xxxxxxxxxxxxxxxxxxxx
# Node ID 9ffa49fe58ab90c41c257663a876454b4cca0440
# Parent  ce48ea86ad72bc8d67214450c5052a3986ff55a9
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 ce48ea86ad72 -r 9ffa49fe58ab linux-2.6-xen-sparse/arch/ia64/Kconfig
--- a/linux-2.6-xen-sparse/arch/ia64/Kconfig    Sun Apr 30 09:47:51 2006 +0100
+++ b/linux-2.6-xen-sparse/arch/ia64/Kconfig    Sun Apr 30 09:50:49 2006 +0100
@@ -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 ce48ea86ad72 -r 9ffa49fe58ab 
linux-2.6-xen-sparse/drivers/xen/blkback/blkback.c
--- a/linux-2.6-xen-sparse/drivers/xen/blkback/blkback.c        Sun Apr 30 
09:47:51 2006 +0100
+++ b/linux-2.6-xen-sparse/drivers/xen/blkback/blkback.c        Sun Apr 30 
09:50:49 2006 +0100
@@ -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 ce48ea86ad72 -r 9ffa49fe58ab 
linux-2.6-xen-sparse/drivers/xen/blkback/interface.c
--- a/linux-2.6-xen-sparse/drivers/xen/blkback/interface.c      Sun Apr 30 
09:47:51 2006 +0100
+++ b/linux-2.6-xen-sparse/drivers/xen/blkback/interface.c      Sun Apr 30 
09:50:49 2006 +0100
@@ -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);
diff -r ce48ea86ad72 -r 9ffa49fe58ab linux-2.6-xen-sparse/lib/Makefile
--- a/linux-2.6-xen-sparse/lib/Makefile Sun Apr 30 09:47:51 2006 +0100
+++ b/linux-2.6-xen-sparse/lib/Makefile Sun Apr 30 09:50:49 2006 +0100
@@ -45,7 +45,7 @@ obj-$(CONFIG_TEXTSEARCH_FSM) += ts_fsm.o
 obj-$(CONFIG_TEXTSEARCH_FSM) += ts_fsm.o
 
 obj-$(CONFIG_SWIOTLB) += swiotlb.o
-ifneq ($(CONFIG_IA64)$(CONFIG_XEN_IA64_DOM0_VP),yn)
+ifneq ($(CONFIG_XEN_IA64_DOM0_NON_VP),y)
 swiotlb-$(CONFIG_XEN) := ../arch/i386/kernel/swiotlb.o
 endif
 

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