ia64/xen-unstable

changeset 3254:d455acded006

bitkeeper revision 1.1159.170.60 (41b5f6f8C9PiyGZaHTSWyeJCoW8V_g)

ioremap.c:
whitespace
author cl349@arcadians.cl.cam.ac.uk
date Tue Dec 07 18:31:20 2004 +0000 (2004-12-07)
parents a169836882cb
children cb4e23337578
files linux-2.6.10-rc2-xen-sparse/arch/xen/i386/mm/ioremap.c
line diff
     1.1 --- a/linux-2.6.10-rc2-xen-sparse/arch/xen/i386/mm/ioremap.c	Mon Dec 06 20:37:17 2004 +0000
     1.2 +++ b/linux-2.6.10-rc2-xen-sparse/arch/xen/i386/mm/ioremap.c	Tue Dec 07 18:31:20 2004 +0000
     1.3 @@ -22,7 +22,7 @@
     1.4  #ifndef CONFIG_XEN_PHYSDEV_ACCESS
     1.5  
     1.6  void * __ioremap(unsigned long phys_addr, unsigned long size,
     1.7 -		unsigned long flags)
     1.8 +		 unsigned long flags)
     1.9  {
    1.10  	return NULL;
    1.11  }
    1.12 @@ -123,7 +123,10 @@ void __iomem * __ioremap(unsigned long p
    1.13  		return NULL;
    1.14  	area->phys_addr = phys_addr;
    1.15  	addr = (void __iomem *) area->addr;
    1.16 -	if (direct_remap_area_pages(&init_mm, (unsigned long) addr, phys_addr, size, __pgprot(_PAGE_PRESENT | _PAGE_RW | _PAGE_DIRTY | _PAGE_ACCESSED | flags), DOMID_IO)) {
    1.17 +	if (direct_remap_area_pages(&init_mm, (unsigned long) addr, phys_addr,
    1.18 +				    size, __pgprot(_PAGE_PRESENT | _PAGE_RW |
    1.19 +						   _PAGE_DIRTY | _PAGE_ACCESSED
    1.20 +						   | flags), DOMID_IO)) {
    1.21  		vunmap((void __force *) addr);
    1.22  		return NULL;
    1.23  	}
    1.24 @@ -395,7 +398,7 @@ int direct_remap_area_pages(struct mm_st
    1.25  						  start_address, 
    1.26  						  address-start_address, 
    1.27  						  w);
    1.28 -	
    1.29 + 
    1.30  			if (HYPERVISOR_mmu_update(u, v - u, NULL) < 0)
    1.31  				return -EFAULT;
    1.32  			v = w;
    1.33 @@ -420,7 +423,7 @@ int direct_remap_area_pages(struct mm_st
    1.34  					  address-start_address, 
    1.35  					  w);
    1.36  		if (unlikely(HYPERVISOR_mmu_update(u, v - u, NULL) < 0))
    1.37 -			return -EFAULT;	
    1.38 +			return -EFAULT;
    1.39  	}
    1.40  
    1.41  	flush_tlb_all();