[Xen-changelog] Manual merge.

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

# HG changeset patch
# User kaf24@xxxxxxxxxxxxxxxxxxxx
# Node ID dd798dd2abced1bb8000d803df7d2d858c13ccf9
# Parent  afe05231fe25ce064fc493e6287d0ffce304fe59

# Parent  5c6ef0bec2dfe2347cad4d48f64e36c907f04eb1
Manual merge.

diff -r afe05231fe25 -r dd798dd2abce 
linux-2.6.11-xen-sparse/drivers/xen/blkback/blkback.c
--- a/linux-2.6.11-xen-sparse/drivers/xen/blkback/blkback.c     Mon Jul 11 
09:00:12 2005
+++ b/linux-2.6.11-xen-sparse/drivers/xen/blkback/blkback.c     Mon Jul 11 
09:00:35 2005
@@ -541,11 +541,12 @@
     else
         remap_prot = _PAGE_PRESENT|_PAGE_DIRTY|_PAGE_ACCESSED;
 
+
     for ( i = 0; i < nseg; i++ )
     {
        MULTI_update_va_mapping_otherdomain(
            mcl+i, MMAP_VADDR(pending_idx, i),
-           pfn_pte_ma(seg[i].buf >> PAGE_SHIFT, remap_prot),
+           pfn_pte_ma(seg[i].buf >> PAGE_SHIFT, __pgprot(remap_prot)),
            0, blkif->domid);
 #ifdef CONFIG_XEN_BLKDEV_TAP_BE
         if ( blkif->is_blktap )

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