From: Martin Lucina <martin@lucina.net>
Date: Thu, 18 Dec 2014 11:59:54 +0000 (+0100)
Subject: Mini-OS: Add more symbols to global namespace
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=848bf1fa9c8921873ec2bff9d66576170a71d897;p=rumpuser-xen.git

Mini-OS: Add more symbols to global namespace

Adding minios_ioremap, minios_ioremap_nocache, minios_iounmap,
minios_alloc_contig_pages. Required by rumphyper_pci.

Signed-off-by: Martin Lucina <martin@lucina.net>
---

diff --git a/xen/arch/x86/ioremap.c b/xen/arch/x86/ioremap.c
index e9bdd48..ab2a81d 100644
--- a/xen/arch/x86/ioremap.c
+++ b/xen/arch/x86/ioremap.c
@@ -60,19 +60,19 @@ mfn_invalid:
     return NULL;
 }
 
-void *ioremap(unsigned long phys_addr, unsigned long size)
+void *minios_ioremap(unsigned long phys_addr, unsigned long size)
 {
     return __do_ioremap(phys_addr, size, IO_PROT);
 }
 
-void *ioremap_nocache(unsigned long phys_addr, unsigned long size)
+void *minios_ioremap_nocache(unsigned long phys_addr, unsigned long size)
 {
     return __do_ioremap(phys_addr, size, IO_PROT_NOCACHE);
 }
 
 /* Un-map the io-remapped region. Currently no list of existing mappings is
  * maintained, so the caller has to supply the size */
-void iounmap(void *virt_addr, unsigned long size)
+void minios_iounmap(void *virt_addr, unsigned long size)
 {   
     unsigned long num_pages;
     unsigned long va = (unsigned long)virt_addr;
diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c
index c61747a..d47dc61 100644
--- a/xen/arch/x86/mm.c
+++ b/xen/arch/x86/mm.c
@@ -701,7 +701,7 @@ int unmap_frames(unsigned long va, unsigned long num_frames)
  * based on Linux function xen_create_contiguous_region()
  */
 #define MAX_CONTIG_ORDER 9 /* 2MB */
-unsigned long alloc_contig_pages(int order, unsigned int addr_bits)
+unsigned long minios_alloc_contig_pages(int order, unsigned int addr_bits)
 {
     unsigned long in_va, va;
     unsigned long in_frames[1UL << order], out_frames, mfn;
diff --git a/xen/include/mini-os/ioremap.h b/xen/include/mini-os/ioremap.h
index a9b08f4..ad4f7dd 100644
--- a/xen/include/mini-os/ioremap.h
+++ b/xen/include/mini-os/ioremap.h
@@ -24,9 +24,9 @@
 #ifndef _MINIOS_IOREMAP_H_
 #define _MINIOS_IOREMAP_H_
 
-void *ioremap(unsigned long phys_addr, unsigned long size);
-void *ioremap_nocache(unsigned long phys_addr, unsigned long size);
-void iounmap(void *virt_addr, unsigned long size);
+void *minios_ioremap(unsigned long phys_addr, unsigned long size);
+void *minios_ioremap_nocache(unsigned long phys_addr, unsigned long size);
+void minios_iounmap(void *virt_addr, unsigned long size);
 
 #endif /* _MINIOS_IOREMAP_H_ */
 
diff --git a/xen/include/mini-os/mm.h b/xen/include/mini-os/mm.h
index 148ea3c..ec3db6a 100644
--- a/xen/include/mini-os/mm.h
+++ b/xen/include/mini-os/mm.h
@@ -72,7 +72,7 @@ void do_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 alloc_contig_pages(int order, unsigned int addr_bits);
+unsigned long minios_alloc_contig_pages(int order, unsigned int addr_bits);
 
 int free_physical_pages(xen_pfn_t *mfns, int n);
 void fini_mm(void);