xen-changelog

[Top] [All Lists]

[Xen-changelog] fix build when not using grant tables for blkdev.

from [Xen patchbot -unstable]

[Permanent Link][Original]

To:	xen-changelog@xxxxxxxxxxxxxxxxxxx
Subject:	[Xen-changelog] fix build when not using grant tables for blkdev.
From:	Xen patchbot -unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>
Date:	Sun, 10 Jul 2005 15:16:10 -0400
Delivery-date:	Sun, 10 Jul 2005 19:16:34 +0000
Envelope-to:	www-data@xxxxxxxxxxxxxxxxxxx
List-help:	<mailto:xen-changelog-request@lists.xensource.com?subject=help>
List-id:	BK change log <xen-changelog.lists.xensource.com>
List-post:	<mailto:xen-changelog@lists.xensource.com>
List-subscribe:	<http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=subscribe>
List-unsubscribe:	<http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=unsubscribe>
Reply-to:	xen-devel@xxxxxxxxxxxxxxxxxxx
Sender:	xen-changelog-bounces@xxxxxxxxxxxxxxxxxxx

# HG changeset patch
# User smh22@xxxxxxxxxxxxxxxxxxxx
# Node ID 5c6ef0bec2dfe2347cad4d48f64e36c907f04eb1
# Parent  25e96ea6e4c5dd4a58be72a9b63b75380da524f1

fix build when not using grant tables for blkdev. 

Signed-off-by: Steven Hand <steven@xxxxxxxxxxxxx>

diff -r 25e96ea6e4c5 -r 5c6ef0bec2df 
linux-2.6.11-xen-sparse/drivers/xen/blkback/blkback.c
--- a/linux-2.6.11-xen-sparse/drivers/xen/blkback/blkback.c     Sun Jul 10 
17:32:01 2005
+++ b/linux-2.6.11-xen-sparse/drivers/xen/blkback/blkback.c     Sun Jul 10 
19:16:40 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

[More with this subject...]

<Prev in Thread]	Current Thread	[Next in Thread>
[Xen-changelog] fix build when not using grant tables for blkdev., Xen patchbot -unstable <=

Previous by Date:	[Xen-changelog] Manual merge., Xen patchbot -unstable
Next by Date:	[Xen-changelog] Fix xenctx compilation and support 64 bit., Xen patchbot -unstable
Previous by Thread:	[Xen-changelog] Small fix to x86_64 entry.S., Xen patchbot -unstable
Next by Thread:	[Xen-changelog] Fix xenctx compilation and support 64 bit., Xen patchbot -unstable
Indexes:	[Date] [Thread] [Top] [All Lists]