[Xen-changelog] Yet more PAE fixes, this time in the paravirt drivers.

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

# HG changeset patch
# User iap10@xxxxxxxxxxxxxxxxxxxxx
# Node ID 006efe128837570db5beb25ad19f311c67a4de4c
# Parent  f0d728001aaad4eb6c716cbdbb5d1f8a8a5f1620
Yet more PAE fixes, this time in the paravirt drivers.
Signed-off-by: ian@xxxxxxxxxxxxx

diff -r f0d728001aaa -r 006efe128837 
linux-2.6-xen-sparse/drivers/xen/blkfront/blkfront.c
--- a/linux-2.6-xen-sparse/drivers/xen/blkfront/blkfront.c      Wed Sep  7 
23:11:44 2005
+++ b/linux-2.6-xen-sparse/drivers/xen/blkfront/blkfront.c      Thu Sep  8 
01:00:04 2005
@@ -182,7 +182,7 @@
 static int blkif_queue_request(struct request *req)
 {
        struct blkfront_info *info = req->rq_disk->private_data;
-       unsigned long buffer_ma;
+       unsigned long buffer_mfn;
        blkif_request_t *ring_req;
        struct bio *bio;
        struct bio_vec *bvec;
@@ -221,7 +221,7 @@
                bio_for_each_segment (bvec, bio, idx) {
                        BUG_ON(ring_req->nr_segments
                               == BLKIF_MAX_SEGMENTS_PER_REQUEST);
-                       buffer_ma = page_to_phys(bvec->bv_page);
+                       buffer_mfn = page_to_phys(bvec->bv_page) >> PAGE_SHIFT;
                        fsect = bvec->bv_offset >> 9;
                        lsect = fsect + (bvec->bv_len >> 9) - 1;
                        /* install a grant reference. */
@@ -231,11 +231,11 @@
                        gnttab_grant_foreign_access_ref(
                                ref,
                                info->backend_id,
-                               buffer_ma >> PAGE_SHIFT,
+                               buffer_mfn,
                                rq_data_dir(req) );
 
                        info->shadow[id].frame[ring_req->nr_segments] =
-                               buffer_ma >> PAGE_SHIFT;
+                               buffer_mfn;
 
                        ring_req->frame_and_sects[ring_req->nr_segments] =
                                blkif_fas_from_gref(ref, fsect, lsect);
diff -r f0d728001aaa -r 006efe128837 
linux-2.6-xen-sparse/drivers/xen/netback/netback.c
--- a/linux-2.6-xen-sparse/drivers/xen/netback/netback.c        Wed Sep  7 
23:11:44 2005
+++ b/linux-2.6-xen-sparse/drivers/xen/netback/netback.c        Thu Sep  8 
01:00:04 2005
@@ -297,7 +297,7 @@
         mmuext->mfn = old_mfn;
         mmuext++;
 #endif
-        mmu->ptr = (new_mfn << PAGE_SHIFT) | MMU_MACHPHYS_UPDATE;
+        mmu->ptr = ((unsigned long long)new_mfn << PAGE_SHIFT) | 
MMU_MACHPHYS_UPDATE;
         mmu->val = __pa(vdata) >> PAGE_SHIFT;  
         mmu++;
 
diff -r f0d728001aaa -r 006efe128837 
linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c
--- a/linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c      Wed Sep  7 
23:11:44 2005
+++ b/linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c      Thu Sep  8 
01:00:04 2005
@@ -618,7 +618,7 @@
 
         /* Remap the page. */
 #ifdef CONFIG_XEN_NETDEV_GRANT
-        mmu->ptr = mfn << PAGE_SHIFT | MMU_MACHPHYS_UPDATE;
+        mmu->ptr = ((unsigned long long)mfn << PAGE_SHIFT) | 
MMU_MACHPHYS_UPDATE;
 #else
         mmu->ptr  = (rx->addr & PAGE_MASK) | MMU_MACHPHYS_UPDATE;
 #endif

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