ia64/xen-unstable

changeset 2067:54f347fa007f

bitkeeper revision 1.1137.1.1 (410fd46dbo4BdLBLEMnuCF1i4zvASw)

Merge freefall.cl.cam.ac.uk:/auto/groups/xeno/users/cl349/BK/xeno.bk-26dom0
into freefall.cl.cam.ac.uk:/local/scratch/cl349/xeno.bk-26dom0
author cl349@freefall.cl.cam.ac.uk
date Tue Aug 03 18:07:41 2004 +0000 (2004-08-03)
parents ef4ec427c032 f6353cfb77fa
children 2dde267e9db1
files linux-2.6.7-xen-sparse/arch/xen/i386/mm/pgtable.c linux-2.6.7-xen-sparse/drivers/xen/blkfront/blkfront.c linux-2.6.7-xen-sparse/include/asm-xen/asm-i386/dma-mapping.h linux-2.6.7-xen-sparse/include/asm-xen/asm-i386/io.h
line diff
     1.1 --- a/linux-2.6.7-xen-sparse/arch/xen/i386/mm/pgtable.c	Tue Aug 03 17:38:06 2004 +0000
     1.2 +++ b/linux-2.6.7-xen-sparse/arch/xen/i386/mm/pgtable.c	Tue Aug 03 18:07:41 2004 +0000
     1.3 @@ -195,7 +195,7 @@ struct page *pte_alloc_one(struct mm_str
     1.4  #endif
     1.5  	if (pte) {
     1.6  		clear_highpage(pte);
     1.7 -		__make_page_readonly(phys_to_virt(page_to_phys(pte)));
     1.8 +		__make_page_readonly(phys_to_virt(page_to_pseudophys(pte)));
     1.9  				/* XXXcl highmem */
    1.10  	}
    1.11  	return pte;
     2.1 --- a/linux-2.6.7-xen-sparse/drivers/xen/blkfront/blkfront.c	Tue Aug 03 17:38:06 2004 +0000
     2.2 +++ b/linux-2.6.7-xen-sparse/drivers/xen/blkfront/blkfront.c	Tue Aug 03 18:07:41 2004 +0000
     2.3 @@ -225,8 +225,7 @@ static int blkif_queue_request(struct re
     2.4  	ring_req->nr_segments = 0;
     2.5  	rq_for_each_bio(bio, req) {
     2.6  		bio_for_each_segment(bvec, bio, idx) {
     2.7 -			buffer_ma =
     2.8 -                                phys_to_machine(page_to_phys(bvec->bv_page));
     2.9 +			buffer_ma = page_to_phys(bvec->bv_page);
    2.10  			if (unlikely((buffer_ma & ((1<<9)-1)) != 0))
    2.11  				BUG();
    2.12  
     3.1 --- a/linux-2.6.7-xen-sparse/include/asm-xen/asm-i386/dma-mapping.h	Tue Aug 03 17:38:06 2004 +0000
     3.2 +++ b/linux-2.6.7-xen-sparse/include/asm-xen/asm-i386/dma-mapping.h	Tue Aug 03 18:07:41 2004 +0000
     3.3 @@ -41,7 +41,7 @@ dma_map_sg(struct device *dev, struct sc
     3.4  	for (i = 0; i < nents; i++ ) {
     3.5  		BUG_ON(!sg[i].page);
     3.6  
     3.7 -		sg[i].dma_address = page_to_machine(sg[i].page) + sg[i].offset;
     3.8 +		sg[i].dma_address = page_to_phys(sg[i].page) + sg[i].offset;
     3.9  	}
    3.10  
    3.11  	flush_write_buffers();
    3.12 @@ -53,7 +53,7 @@ dma_map_page(struct device *dev, struct 
    3.13  	     size_t size, enum dma_data_direction direction)
    3.14  {
    3.15  	BUG_ON(direction == DMA_NONE);
    3.16 -	return page_to_machine(page) + offset;
    3.17 +	return page_to_phys(page) + offset;
    3.18  }
    3.19  
    3.20  static inline void
     4.1 --- a/linux-2.6.7-xen-sparse/include/asm-xen/asm-i386/io.h	Tue Aug 03 17:38:06 2004 +0000
     4.2 +++ b/linux-2.6.7-xen-sparse/include/asm-xen/asm-i386/io.h	Tue Aug 03 18:07:41 2004 +0000
     4.3 @@ -85,8 +85,8 @@ static inline void * phys_to_virt(unsign
     4.4  /*
     4.5   * Change "struct page" to physical address.
     4.6   */
     4.7 -#define page_to_phys(page)    ((dma_addr_t)page_to_pfn(page) << PAGE_SHIFT)
     4.8 -#define page_to_machine(page) (phys_to_machine(page_to_phys(page)))
     4.9 +#define page_to_pseudophys(page) ((dma_addr_t)page_to_pfn(page) << PAGE_SHIFT)
    4.10 +#define page_to_phys(page)       (phys_to_machine(page_to_pseudophys(page)))
    4.11  
    4.12  extern void * __ioremap(unsigned long offset, unsigned long size, unsigned long flags);
    4.13