minios: export do_map_frames as minios_map_frames

Signed-off-by: Wei Liu <liuw@liuw.name>
rumpkernel · Jun 24, 2015 · 7637c6c · 7637c6c
1 parent 4be390b
commit 7637c6c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/platform/xen/xen/arch/x86/mm.c b/platform/xen/xen/arch/x86/mm.c
@@ -553,10 +553,10 @@ unsigned long allocate_ondemand(unsigned long n, unsigned long alignment)
  * va. map f[i*stride]+i*increment for i in 0..n-1.
  */
 #define MAP_BATCH ((STACK_SIZE / 2) / sizeof(mmu_update_t))
-void do_map_frames(unsigned long va,
-                   const unsigned long *mfns, unsigned long n, 
-                   unsigned long stride, unsigned long incr, 
-                   domid_t id, int *err, unsigned long prot)
+void minios_map_frames(unsigned long va,
+		       const unsigned long *mfns, unsigned long n,
+		       unsigned long stride, unsigned long incr,
+		       domid_t id, int *err, unsigned long prot)
 {
     pgentry_t *pgt = NULL;
     unsigned long done = 0;
@@ -565,7 +565,7 @@ void do_map_frames(unsigned long va,
 
     if ( !mfns ) 
     {
-        minios_printk("do_map_frames: no mfns supplied\n");
+        minios_printk("minios_map_frames: no mfns supplied\n");
         return;
     }
     DEBUG("va=%p n=0x%lx, mfns[0]=0x%lx stride=0x%lx incr=0x%lx prot=0x%lx\n",
@@ -629,7 +629,7 @@ void *minios_map_frames_ex(const unsigned long *mfns, unsigned long n,
     if ( !va )
         return NULL;
 
-    do_map_frames(va, mfns, n, stride, incr, id, err, prot);
+    minios_map_frames(va, mfns, n, stride, incr, id, err, prot);
 
     return (void *)va;
 }

diff --git a/platform/xen/xen/include/mini-os/mm.h b/platform/xen/xen/include/mini-os/mm.h
@@ -63,8 +63,8 @@ void *minios_map_frames_ex(const unsigned long *f, unsigned long n,
 	unsigned long stride,
 	unsigned long increment, unsigned long alignment, domid_t id,
 	int *err, unsigned long prot);
-void do_map_frames(unsigned long addr,
-        const unsigned long *f, unsigned long n, unsigned long stride,
+void minios_map_frames(unsigned long addr,
+    const unsigned long *f, unsigned long n, unsigned long stride,
 	unsigned long increment, domid_t id, int *err, unsigned long prot);
 int unmap_frames(unsigned long va, unsigned long num_frames);
 unsigned long minios_alloc_contig_pages(int order, unsigned int addr_bits);

diff --git a/platform/xen/xen/include/mini-os/x86/mm.h b/platform/xen/xen/include/mini-os/x86/mm.h
@@ -228,7 +228,7 @@ static __inline__ paddr_t machine_to_phys(maddr_t machine)
 
 #define map_frames(f, n) minios_map_frames_ex(f, n, 1, 0, 1, DOMID_SELF, NULL, L1_PROT)
 #define map_zero(n, a) minios_map_frames_ex(&mfn_zero, n, 0, 0, a, DOMID_SELF, NULL, L1_PROT_RO)
-#define do_map_zero(start, n) do_map_frames(start, &mfn_zero, n, 0, 0, DOMID_SELF, NULL, L1_PROT_RO)
+#define do_map_zero(start, n) minios_map_frames(start, &mfn_zero, n, 0, 0, DOMID_SELF, NULL, L1_PROT_RO)
 
 pgentry_t *need_pgt(unsigned long addr);
 int mfn_is_ram(unsigned long mfn);