[Xen-changelog] Move definition of direct_remap_area_pages from pgalloc.h to pgtable.h,

[BitKeeper B. <ri...@su...>]

ChangeSet 1.1550.12.1, 2004/11/19 16:38:51+00:00, cl...@ar...

	Move definition of direct_remap_area_pages from pgalloc.h to pgtable.h,
	next to io_remap_page_range.



 drivers/char/mem.c                 |   10 +++++-----
 include/asm-xen/asm-i386/pgalloc.h |   11 -----------
 include/asm-xen/asm-i386/pgtable.h |   11 +++++++++++
 3 files changed, 16 insertions(+), 16 deletions(-)


diff -Nru a/linux-2.6.10-rc2-xen-sparse/drivers/char/mem.c b/linux-2.6.10-rc2-xen-sparse/drivers/char/mem.c
--- a/linux-2.6.10-rc2-xen-sparse/drivers/char/mem.c	2004-12-27 10:04:31 -05:00
+++ b/linux-2.6.10-rc2-xen-sparse/drivers/char/mem.c	2004-12-27 10:04:31 -05:00
@@ -26,7 +26,6 @@
 
 #include <asm/uaccess.h>
 #include <asm/io.h>
-#include <asm/pgalloc.h>
 
 #ifdef CONFIG_IA64
 # include <linux/efi.h>
@@ -44,10 +43,10 @@
 static inline int uncached_access(struct file *file, unsigned long addr)
 {
 #ifdef CONFIG_XEN
-        if (file->f_flags & O_SYNC)
-                return 1;
-        /* Xen sets correct MTRR type on non-RAM for us. */
-        return 0;
+	if (file->f_flags & O_SYNC)
+		return 1;
+	/* Xen sets correct MTRR type on non-RAM for us. */
+	return 0;
 #elif defined(__i386__)
 	/*
 	 * On the PPro and successors, the MTRRs are used to set
@@ -215,6 +214,7 @@
 				vma->vm_page_prot))
 		return -EAGAIN;
 #else
+	/* Remap-pfn-range will mark the range VM_IO and VM_RESERVED */
 	if (remap_pfn_range(vma,
 			    vma->vm_start,
 			    vma->vm_pgoff,
diff -Nru a/linux-2.6.10-rc2-xen-sparse/include/asm-xen/asm-i386/pgalloc.h b/linux-2.6.10-rc2-xen-sparse/include/asm-xen/asm-i386/pgalloc.h
--- a/linux-2.6.10-rc2-xen-sparse/include/asm-xen/asm-i386/pgalloc.h	2004-12-27 10:04:31 -05:00
+++ b/linux-2.6.10-rc2-xen-sparse/include/asm-xen/asm-i386/pgalloc.h	2004-12-27 10:04:31 -05:00
@@ -53,15 +53,4 @@
 
 #define check_pgt_cache()	do { } while (0)
 
-int direct_remap_area_pages(struct mm_struct *mm,
-                            unsigned long address, 
-                            unsigned long machine_addr,
-                            unsigned long size, 
-                            pgprot_t prot,
-                            domid_t  domid);
-int __direct_remap_area_pages(struct mm_struct *mm,
-			      unsigned long address, 
-			      unsigned long size, 
-			      mmu_update_t *v);
-
 #endif /* _I386_PGALLOC_H */
diff -Nru a/linux-2.6.10-rc2-xen-sparse/include/asm-xen/asm-i386/pgtable.h b/linux-2.6.10-rc2-xen-sparse/include/asm-xen/asm-i386/pgtable.h
--- a/linux-2.6.10-rc2-xen-sparse/include/asm-xen/asm-i386/pgtable.h	2004-12-27 10:04:31 -05:00
+++ b/linux-2.6.10-rc2-xen-sparse/include/asm-xen/asm-i386/pgtable.h	2004-12-27 10:04:31 -05:00
@@ -490,6 +490,17 @@
 #define io_remap_page_range(vma,from,phys,size,prot)                     \
         direct_remap_area_pages(vma->vm_mm,from,phys,size,prot,DOMID_IO)
 
+int direct_remap_area_pages(struct mm_struct *mm,
+                            unsigned long address, 
+                            unsigned long machine_addr,
+                            unsigned long size, 
+                            pgprot_t prot,
+                            domid_t  domid);
+int __direct_remap_area_pages(struct mm_struct *mm,
+			      unsigned long address, 
+			      unsigned long size, 
+			      mmu_update_t *v);
+
 #define __HAVE_ARCH_PTEP_TEST_AND_CLEAR_YOUNG
 #define __HAVE_ARCH_PTEP_TEST_AND_CLEAR_DIRTY
 #define __HAVE_ARCH_PTEP_GET_AND_CLEAR