ia64/xen-unstable

changeset 6699:006efe128837

Yet more PAE fixes, this time in the paravirt drivers.
Signed-off-by: ian@xensource.com
author iap10@freefall.cl.cam.ac.uk
date Thu Sep 08 01:00:04 2005 +0000 (2005-09-08)
parents f0d728001aaa
children 12ff9c954ace
files linux-2.6-xen-sparse/drivers/xen/blkfront/blkfront.c linux-2.6-xen-sparse/drivers/xen/netback/netback.c linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c
line diff
     1.1 --- a/linux-2.6-xen-sparse/drivers/xen/blkfront/blkfront.c	Wed Sep 07 23:11:44 2005 +0000
     1.2 +++ b/linux-2.6-xen-sparse/drivers/xen/blkfront/blkfront.c	Thu Sep 08 01:00:04 2005 +0000
     1.3 @@ -182,7 +182,7 @@ int blkif_ioctl(struct inode *inode, str
     1.4  static int blkif_queue_request(struct request *req)
     1.5  {
     1.6  	struct blkfront_info *info = req->rq_disk->private_data;
     1.7 -	unsigned long buffer_ma;
     1.8 +	unsigned long buffer_mfn;
     1.9  	blkif_request_t *ring_req;
    1.10  	struct bio *bio;
    1.11  	struct bio_vec *bvec;
    1.12 @@ -221,7 +221,7 @@ static int blkif_queue_request(struct re
    1.13  		bio_for_each_segment (bvec, bio, idx) {
    1.14  			BUG_ON(ring_req->nr_segments
    1.15  			       == BLKIF_MAX_SEGMENTS_PER_REQUEST);
    1.16 -			buffer_ma = page_to_phys(bvec->bv_page);
    1.17 +			buffer_mfn = page_to_phys(bvec->bv_page) >> PAGE_SHIFT;
    1.18  			fsect = bvec->bv_offset >> 9;
    1.19  			lsect = fsect + (bvec->bv_len >> 9) - 1;
    1.20  			/* install a grant reference. */
    1.21 @@ -231,11 +231,11 @@ static int blkif_queue_request(struct re
    1.22  			gnttab_grant_foreign_access_ref(
    1.23  				ref,
    1.24  				info->backend_id,
    1.25 -				buffer_ma >> PAGE_SHIFT,
    1.26 +				buffer_mfn,
    1.27  				rq_data_dir(req) );
    1.28  
    1.29  			info->shadow[id].frame[ring_req->nr_segments] =
    1.30 -				buffer_ma >> PAGE_SHIFT;
    1.31 +				buffer_mfn;
    1.32  
    1.33  			ring_req->frame_and_sects[ring_req->nr_segments] =
    1.34  				blkif_fas_from_gref(ref, fsect, lsect);
     2.1 --- a/linux-2.6-xen-sparse/drivers/xen/netback/netback.c	Wed Sep 07 23:11:44 2005 +0000
     2.2 +++ b/linux-2.6-xen-sparse/drivers/xen/netback/netback.c	Thu Sep 08 01:00:04 2005 +0000
     2.3 @@ -297,7 +297,7 @@ static void net_rx_action(unsigned long 
     2.4          mmuext->mfn = old_mfn;
     2.5          mmuext++;
     2.6  #endif
     2.7 -        mmu->ptr = (new_mfn << PAGE_SHIFT) | MMU_MACHPHYS_UPDATE;
     2.8 +        mmu->ptr = ((unsigned long long)new_mfn << PAGE_SHIFT) | MMU_MACHPHYS_UPDATE;
     2.9          mmu->val = __pa(vdata) >> PAGE_SHIFT;  
    2.10          mmu++;
    2.11  
     3.1 --- a/linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c	Wed Sep 07 23:11:44 2005 +0000
     3.2 +++ b/linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c	Thu Sep 08 01:00:04 2005 +0000
     3.3 @@ -618,7 +618,7 @@ static int netif_poll(struct net_device 
     3.4  
     3.5          /* Remap the page. */
     3.6  #ifdef CONFIG_XEN_NETDEV_GRANT
     3.7 -        mmu->ptr = mfn << PAGE_SHIFT | MMU_MACHPHYS_UPDATE;
     3.8 +        mmu->ptr = ((unsigned long long)mfn << PAGE_SHIFT) | MMU_MACHPHYS_UPDATE;
     3.9  #else
    3.10          mmu->ptr  = (rx->addr & PAGE_MASK) | MMU_MACHPHYS_UPDATE;
    3.11  #endif