ia64/xen-unstable

changeset 6212:be46dad1467d

cleanup whitespace.
Signed-off-by: Christian Limpach <Christian.Limpach@cl.cam.ac.uk>
author cl349@firebug.cl.cam.ac.uk
date Tue Aug 16 17:00:52 2005 +0000 (2005-08-16)
parents 24e881f81cea
children 26c03c17c418
files linux-2.6-xen-sparse/arch/xen/i386/mm/ioremap.c
line diff
     1.1 --- a/linux-2.6-xen-sparse/arch/xen/i386/mm/ioremap.c	Tue Aug 16 16:34:46 2005 +0000
     1.2 +++ b/linux-2.6-xen-sparse/arch/xen/i386/mm/ioremap.c	Tue Aug 16 17:00:52 2005 +0000
     1.3 @@ -332,10 +332,10 @@ int direct_remap_area_pages(struct mm_st
     1.4  	for (i = 0; i < size; i += PAGE_SIZE) {
     1.5  		if ((v - u) == MAX_DIRECTMAP_MMU_QUEUE) {
     1.6  			/* Fill in the PTE pointers. */
     1.7 -                        generic_page_range(mm, start_address, 
     1.8 -                                           address-start_address,
     1.9 -                                           direct_remap_area_pte_fn, &w);
    1.10 -                        w = u;
    1.11 +			generic_page_range(mm, start_address, 
    1.12 +					   address - start_address,
    1.13 +					   direct_remap_area_pte_fn, &w);
    1.14 +			w = u;
    1.15  			if (HYPERVISOR_mmu_update(u, v - u, NULL, domid) < 0)
    1.16  				return -EFAULT;
    1.17  			v = u;
    1.18 @@ -355,9 +355,8 @@ int direct_remap_area_pages(struct mm_st
    1.19  
    1.20  	if (v != u) {
    1.21  		/* get the ptep's filled in */
    1.22 -                generic_page_range(mm, start_address, 
    1.23 -                                   address-start_address,
    1.24 -                                   direct_remap_area_pte_fn, &w);
    1.25 +		generic_page_range(mm, start_address, address - start_address,
    1.26 +				   direct_remap_area_pte_fn, &w);
    1.27  		if (unlikely(HYPERVISOR_mmu_update(u, v - u, NULL, domid) < 0))
    1.28  			return -EFAULT;
    1.29  	}
    1.30 @@ -370,32 +369,34 @@ int direct_remap_area_pages(struct mm_st
    1.31  EXPORT_SYMBOL(direct_remap_area_pages);
    1.32  
    1.33  int create_lookup_pte_addr(struct mm_struct *mm, 
    1.34 -                           unsigned long address,
    1.35 -                           unsigned long *ptep)
    1.36 +			   unsigned long address,
    1.37 +			   unsigned long *ptep)
    1.38  {
    1.39 -    int f(pte_t *pte, struct page *pte_page, unsigned long addr, void *data) 
    1.40 -    {
    1.41 -        unsigned long *ptep = (unsigned long *)data;
    1.42 -        if (ptep) *ptep = (pfn_to_mfn(page_to_pfn(pte_page)) << PAGE_SHIFT)
    1.43 -                       | ((unsigned long)pte & ~PAGE_MASK);
    1.44 -        return 0;
    1.45 -    }
    1.46 +	int f(pte_t *pte, struct page *pte_page, unsigned long addr,
    1.47 +	      void *data) {
    1.48 +		unsigned long *ptep = (unsigned long *)data;
    1.49 +		if (ptep)
    1.50 +			*ptep = (pfn_to_mfn(page_to_pfn(pte_page)) <<
    1.51 +				 PAGE_SHIFT) |
    1.52 +				((unsigned long)pte & ~PAGE_MASK);
    1.53 +		return 0;
    1.54 +	}
    1.55  
    1.56 -    return generic_page_range(mm, address, PAGE_SIZE, f, ptep);
    1.57 +	return generic_page_range(mm, address, PAGE_SIZE, f, ptep);
    1.58  }
    1.59  
    1.60  EXPORT_SYMBOL(create_lookup_pte_addr);
    1.61  
    1.62  int touch_pte_range(struct mm_struct *mm,
    1.63 -                    unsigned long address,
    1.64 -                    unsigned long size)
    1.65 +		    unsigned long address,
    1.66 +		    unsigned long size)
    1.67  {
    1.68 -    int f(pte_t *pte, struct page *pte_page, unsigned long addr, void *data) 
    1.69 -    {
    1.70 -        return 0;
    1.71 -    }
    1.72 +	int f(pte_t *pte, struct page *pte_page, unsigned long addr,
    1.73 +	      void *data) {
    1.74 +		return 0;
    1.75 +	}
    1.76  
    1.77 -    return generic_page_range(mm, address, size, f, NULL);
    1.78 +	return generic_page_range(mm, address, size, f, NULL);
    1.79  }                 
    1.80  
    1.81  EXPORT_SYMBOL(touch_pte_range);