ia64/xen-unstable

changeset 5720:dd798dd2abce

Manual merge.
author kaf24@firebug.cl.cam.ac.uk
date Mon Jul 11 09:00:35 2005 +0000 (2005-07-11)
parents afe05231fe25 5c6ef0bec2df
children c32cf5fef34c
files linux-2.6.11-xen-sparse/arch/xen/configs/xen0_defconfig_x86_64 linux-2.6.11-xen-sparse/drivers/xen/blkback/blkback.c tools/xentrace/Makefile tools/xentrace/xenctx.c xen/arch/x86/vmx.c xen/arch/x86/vmx_platform.c
line diff
     2.1 --- a/linux-2.6.11-xen-sparse/drivers/xen/blkback/blkback.c	Mon Jul 11 09:00:12 2005 +0000
     2.2 +++ b/linux-2.6.11-xen-sparse/drivers/xen/blkback/blkback.c	Mon Jul 11 09:00:35 2005 +0000
     2.3 @@ -541,11 +541,12 @@ static void dispatch_rw_block_io(blkif_t
     2.4      else
     2.5          remap_prot = _PAGE_PRESENT|_PAGE_DIRTY|_PAGE_ACCESSED;
     2.6  
     2.7 +
     2.8      for ( i = 0; i < nseg; i++ )
     2.9      {
    2.10  	MULTI_update_va_mapping_otherdomain(
    2.11  	    mcl+i, MMAP_VADDR(pending_idx, i),
    2.12 -	    pfn_pte_ma(seg[i].buf >> PAGE_SHIFT, remap_prot),
    2.13 +	    pfn_pte_ma(seg[i].buf >> PAGE_SHIFT, __pgprot(remap_prot)),
    2.14  	    0, blkif->domid);
    2.15  #ifdef CONFIG_XEN_BLKDEV_TAP_BE
    2.16          if ( blkif->is_blktap )