ia64/xen-unstable

changeset 9901:9ffa49fe58ab

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@valinux.co.jp>
author kaf24@firebug.cl.cam.ac.uk
date Sun Apr 30 09:50:49 2006 +0100 (2006-04-30)
parents ce48ea86ad72
children 63e29ff50fe6
files linux-2.6-xen-sparse/arch/ia64/Kconfig linux-2.6-xen-sparse/drivers/xen/blkback/blkback.c linux-2.6-xen-sparse/drivers/xen/blkback/interface.c linux-2.6-xen-sparse/lib/Makefile
line diff
     1.1 --- a/linux-2.6-xen-sparse/arch/ia64/Kconfig	Sun Apr 30 09:47:51 2006 +0100
     1.2 +++ b/linux-2.6-xen-sparse/arch/ia64/Kconfig	Sun Apr 30 09:50:49 2006 +0100
     1.3 @@ -90,12 +90,19 @@ config XEN_BLKDEV_BACKEND
     1.4  	default y
     1.5  
     1.6  config XEN_IA64_DOM0_VP
     1.7 +	bool "dom0 vp model"
     1.8  	depends on XEN
     1.9 -	bool
    1.10  	default n
    1.11  	help
    1.12  	  dom0 vp model
    1.13  
    1.14 +config XEN_IA64_DOM0_NON_VP
    1.15 +	bool
    1.16 +	depends on !(XEN && XEN_IA64_DOM0_VP)
    1.17 +	default y
    1.18 +	help
    1.19 +	  dom0 P=M model
    1.20 +
    1.21  config XEN_SYSFS
    1.22  	bool "Export Xen attributes in sysfs"
    1.23  	depends on XEN && SYSFS
     2.1 --- a/linux-2.6-xen-sparse/drivers/xen/blkback/blkback.c	Sun Apr 30 09:47:51 2006 +0100
     2.2 +++ b/linux-2.6-xen-sparse/drivers/xen/blkback/blkback.c	Sun Apr 30 09:50:49 2006 +0100
     2.3 @@ -410,7 +410,7 @@ static void dispatch_rw_block_io(blkif_t
     2.4  		}
     2.5  
     2.6  		pending_handle(pending_req, i) = map[i].handle;
     2.7 -#if defined(__ia64__) && !defined(CONFIG_XEN_IA64_DOM0_VP)
     2.8 +#ifdef CONFIG_XEN_IA64_DOM0_NON_VP
     2.9  		pending_vaddrs[vaddr_pagenr(pending_req, i)] =
    2.10  			(unsigned long)gnttab_map_vaddr(map[i]);
    2.11  #else
    2.12 @@ -546,7 +546,7 @@ static int __init blkif_init(void)
    2.13  
    2.14  	blkif_interface_init();
    2.15  	
    2.16 -#if defined(__ia64__) && !defined(CONFIG_XEN_IA64_DOM0_VP)
    2.17 +#ifdef CONFIG_XEN_IA64_DOM0_NON_VP
    2.18  	extern unsigned long alloc_empty_foreign_map_page_range(
    2.19  		unsigned long pages);
    2.20  	mmap_vstart = (unsigned long)
     3.1 --- a/linux-2.6-xen-sparse/drivers/xen/blkback/interface.c	Sun Apr 30 09:47:51 2006 +0100
     3.2 +++ b/linux-2.6-xen-sparse/drivers/xen/blkback/interface.c	Sun Apr 30 09:50:49 2006 +0100
     3.3 @@ -74,7 +74,7 @@ static int map_frontend_page(blkif_t *bl
     3.4  	blkif->shmem_ref = shared_page;
     3.5  	blkif->shmem_handle = op.handle;
     3.6  
     3.7 -#if defined(__ia64__) && !defined(CONFIG_XEN_IA64_DOM0_VP)
     3.8 +#ifdef CONFIG_XEN_IA64_DOM0_NON_VP
     3.9  	/* on some arch's, map_grant_ref behaves like mmap, in that the
    3.10  	 * passed address is a hint and a different address may be returned */
    3.11  	blkif->blk_ring_area->addr = gnttab_map_vaddr(op);
     4.1 --- a/linux-2.6-xen-sparse/lib/Makefile	Sun Apr 30 09:47:51 2006 +0100
     4.2 +++ b/linux-2.6-xen-sparse/lib/Makefile	Sun Apr 30 09:50:49 2006 +0100
     4.3 @@ -45,7 +45,7 @@ obj-$(CONFIG_TEXTSEARCH_BM) += ts_bm.o
     4.4  obj-$(CONFIG_TEXTSEARCH_FSM) += ts_fsm.o
     4.5  
     4.6  obj-$(CONFIG_SWIOTLB) += swiotlb.o
     4.7 -ifneq ($(CONFIG_IA64)$(CONFIG_XEN_IA64_DOM0_VP),yn)
     4.8 +ifneq ($(CONFIG_XEN_IA64_DOM0_NON_VP),y)
     4.9  swiotlb-$(CONFIG_XEN) := ../arch/i386/kernel/swiotlb.o
    4.10  endif
    4.11