ia64/xen-unstable

changeset 3065:88d784c1d7c4

bitkeeper revision 1.1159.182.1 (419e219b-NEt5mNzRdSAn_QT6BQ4ZA)

Move definition of direct_remap_area_pages from pgalloc.h to pgtable.h,
next to io_remap_page_range.
author cl349@arcadians.cl.cam.ac.uk
date Fri Nov 19 16:38:51 2004 +0000 (2004-11-19)
parents 38c450a5a8a3
children 3ca98cad4ced
files linux-2.6.10-rc2-xen-sparse/drivers/char/mem.c linux-2.6.10-rc2-xen-sparse/include/asm-xen/asm-i386/pgalloc.h linux-2.6.10-rc2-xen-sparse/include/asm-xen/asm-i386/pgtable.h
line diff
     1.1 --- a/linux-2.6.10-rc2-xen-sparse/drivers/char/mem.c	Fri Nov 19 15:37:35 2004 +0000
     1.2 +++ b/linux-2.6.10-rc2-xen-sparse/drivers/char/mem.c	Fri Nov 19 16:38:51 2004 +0000
     1.3 @@ -26,7 +26,6 @@
     1.4  
     1.5  #include <asm/uaccess.h>
     1.6  #include <asm/io.h>
     1.7 -#include <asm/pgalloc.h>
     1.8  
     1.9  #ifdef CONFIG_IA64
    1.10  # include <linux/efi.h>
    1.11 @@ -44,10 +43,10 @@ extern void tapechar_init(void);
    1.12  static inline int uncached_access(struct file *file, unsigned long addr)
    1.13  {
    1.14  #ifdef CONFIG_XEN
    1.15 -        if (file->f_flags & O_SYNC)
    1.16 -                return 1;
    1.17 -        /* Xen sets correct MTRR type on non-RAM for us. */
    1.18 -        return 0;
    1.19 +	if (file->f_flags & O_SYNC)
    1.20 +		return 1;
    1.21 +	/* Xen sets correct MTRR type on non-RAM for us. */
    1.22 +	return 0;
    1.23  #elif defined(__i386__)
    1.24  	/*
    1.25  	 * On the PPro and successors, the MTRRs are used to set
    1.26 @@ -215,6 +214,7 @@ static int mmap_mem(struct file * file, 
    1.27  				vma->vm_page_prot))
    1.28  		return -EAGAIN;
    1.29  #else
    1.30 +	/* Remap-pfn-range will mark the range VM_IO and VM_RESERVED */
    1.31  	if (remap_pfn_range(vma,
    1.32  			    vma->vm_start,
    1.33  			    vma->vm_pgoff,
     2.1 --- a/linux-2.6.10-rc2-xen-sparse/include/asm-xen/asm-i386/pgalloc.h	Fri Nov 19 15:37:35 2004 +0000
     2.2 +++ b/linux-2.6.10-rc2-xen-sparse/include/asm-xen/asm-i386/pgalloc.h	Fri Nov 19 16:38:51 2004 +0000
     2.3 @@ -53,15 +53,4 @@ extern void pte_free(struct page *pte);
     2.4  
     2.5  #define check_pgt_cache()	do { } while (0)
     2.6  
     2.7 -int direct_remap_area_pages(struct mm_struct *mm,
     2.8 -                            unsigned long address, 
     2.9 -                            unsigned long machine_addr,
    2.10 -                            unsigned long size, 
    2.11 -                            pgprot_t prot,
    2.12 -                            domid_t  domid);
    2.13 -int __direct_remap_area_pages(struct mm_struct *mm,
    2.14 -			      unsigned long address, 
    2.15 -			      unsigned long size, 
    2.16 -			      mmu_update_t *v);
    2.17 -
    2.18  #endif /* _I386_PGALLOC_H */
     3.1 --- a/linux-2.6.10-rc2-xen-sparse/include/asm-xen/asm-i386/pgtable.h	Fri Nov 19 15:37:35 2004 +0000
     3.2 +++ b/linux-2.6.10-rc2-xen-sparse/include/asm-xen/asm-i386/pgtable.h	Fri Nov 19 16:38:51 2004 +0000
     3.3 @@ -490,6 +490,17 @@ static inline unsigned long arbitrary_vi
     3.4  #define io_remap_page_range(vma,from,phys,size,prot)                     \
     3.5          direct_remap_area_pages(vma->vm_mm,from,phys,size,prot,DOMID_IO)
     3.6  
     3.7 +int direct_remap_area_pages(struct mm_struct *mm,
     3.8 +                            unsigned long address, 
     3.9 +                            unsigned long machine_addr,
    3.10 +                            unsigned long size, 
    3.11 +                            pgprot_t prot,
    3.12 +                            domid_t  domid);
    3.13 +int __direct_remap_area_pages(struct mm_struct *mm,
    3.14 +			      unsigned long address, 
    3.15 +			      unsigned long size, 
    3.16 +			      mmu_update_t *v);
    3.17 +
    3.18  #define __HAVE_ARCH_PTEP_TEST_AND_CLEAR_YOUNG
    3.19  #define __HAVE_ARCH_PTEP_TEST_AND_CLEAR_DIRTY
    3.20  #define __HAVE_ARCH_PTEP_GET_AND_CLEAR