diff options
| author | kaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk> | 2005-07-11 09:00:35 +0000 |
|---|---|---|
| committer | kaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk> | 2005-07-11 09:00:35 +0000 |
| commit | 42ea4c5a7a4d526c1a3b2b6ea330569b135c604f (patch) | |
| tree | 037cab93e350cc65c8aec62bf36f23f935f6be68 | |
| parent | c27ca580b05ddbb7c16ceafede8b9d9f8d95a66e (diff) | |
| parent | e060edc8d0c4267eacfab4c5793f4d7d4b1fc2d4 (diff) | |
| download | xen-42ea4c5a7a4d526c1a3b2b6ea330569b135c604f.tar.gz xen-42ea4c5a7a4d526c1a3b2b6ea330569b135c604f.tar.bz2 xen-42ea4c5a7a4d526c1a3b2b6ea330569b135c604f.zip | |
Manual merge.
| -rw-r--r-- | linux-2.6.11-xen-sparse/drivers/xen/blkback/blkback.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/linux-2.6.11-xen-sparse/drivers/xen/blkback/blkback.c b/linux-2.6.11-xen-sparse/drivers/xen/blkback/blkback.c index f44c70eb03..969ed44023 100644 --- a/linux-2.6.11-xen-sparse/drivers/xen/blkback/blkback.c +++ b/linux-2.6.11-xen-sparse/drivers/xen/blkback/blkback.c @@ -541,11 +541,12 @@ static void dispatch_rw_block_io(blkif_t *blkif, blkif_request_t *req) 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 ) |