ia64/xen-unstable

changeset 9894:5931e98cd744

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@valinux.co.jp>
author kaf24@firebug.cl.cam.ac.uk
date Fri Apr 28 14:48:50 2006 +0100 (2006-04-28)
parents eba707397410
children e0e68942b205
files linux-2.6-xen-sparse/drivers/xen/blkback/blkback.c linux-2.6-xen-sparse/drivers/xen/blkback/interface.c
line diff
     1.1 --- a/linux-2.6-xen-sparse/drivers/xen/blkback/blkback.c	Fri Apr 28 14:47:42 2006 +0100
     1.2 +++ b/linux-2.6-xen-sparse/drivers/xen/blkback/blkback.c	Fri Apr 28 14:48:50 2006 +0100
     1.3 @@ -410,7 +410,7 @@ static void dispatch_rw_block_io(blkif_t
     1.4  		}
     1.5  
     1.6  		pending_handle(pending_req, i) = map[i].handle;
     1.7 -#ifdef __ia64__
     1.8 +#if defined(__ia64__) && !defined(CONFIG_XEN_IA64_DOM0_VP)
     1.9  		pending_vaddrs[vaddr_pagenr(pending_req, i)] =
    1.10  			(unsigned long)gnttab_map_vaddr(map[i]);
    1.11  #else
    1.12 @@ -546,7 +546,7 @@ static int __init blkif_init(void)
    1.13  
    1.14  	blkif_interface_init();
    1.15  	
    1.16 -#ifdef __ia64__
    1.17 +#if defined(__ia64__) && !defined(CONFIG_XEN_IA64_DOM0_VP)
    1.18  	extern unsigned long alloc_empty_foreign_map_page_range(
    1.19  		unsigned long pages);
    1.20  	mmap_vstart = (unsigned long)
     2.1 --- a/linux-2.6-xen-sparse/drivers/xen/blkback/interface.c	Fri Apr 28 14:47:42 2006 +0100
     2.2 +++ b/linux-2.6-xen-sparse/drivers/xen/blkback/interface.c	Fri Apr 28 14:48:50 2006 +0100
     2.3 @@ -74,7 +74,7 @@ static int map_frontend_page(blkif_t *bl
     2.4  	blkif->shmem_ref = shared_page;
     2.5  	blkif->shmem_handle = op.handle;
     2.6  
     2.7 -#ifdef __ia64__
     2.8 +#if defined(__ia64__) && !defined(CONFIG_XEN_IA64_DOM0_VP)
     2.9  	/* on some arch's, map_grant_ref behaves like mmap, in that the
    2.10  	 * passed address is a hint and a different address may be returned */
    2.11  	blkif->blk_ring_area->addr = gnttab_map_vaddr(op);