Retire the bmk_platform_{alloc,free}2() wrappers.

Always use bmk_pgalloc() directly.
rumpkernel · Jun 19, 2015 · 7a91fb1 · 7a91fb1
1 parent 26c05b0
commit 7a91fb1
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 35 deletions.
diff --git a/include/bmk-core/platform.h b/include/bmk-core/platform.h
@@ -28,8 +28,6 @@
 
 #include <bmk-core/types.h>
 
-void *bmk_platform_allocpg2(int);
-void bmk_platform_freepg2(void *, int);
 void bmk_platform_block(bmk_time_t);
 unsigned long bmk_platform_memsize(void);
 

diff --git a/lib/libbmk_core/memalloc.c b/lib/libbmk_core/memalloc.c
@@ -68,6 +68,7 @@
 #include <bmk-core/string.h>
 #include <bmk-core/memalloc.h>
 #include <bmk-core/platform.h>
+#include <bmk-core/pgalloc.h>
 #include <bmk-core/printf.h>
 
 #endif
@@ -328,7 +329,7 @@ corealloc(int shift)
 #ifdef MEMALLOC_TESTING
 	v = malloc((1<<shift) * pagesz);
 #else
-	v = bmk_platform_allocpg2(shift);
+	v = (void *)bmk_pgalloc(shift);
 #endif
 
 	return v;

diff --git a/lib/libbmk_core/sched.c b/lib/libbmk_core/sched.c
@@ -33,6 +33,7 @@
 #include <bmk-core/errno.h>
 #include <bmk-core/memalloc.h>
 #include <bmk-core/platform.h>
+#include <bmk-core/pgalloc.h>
 #include <bmk-core/printf.h>
 #include <bmk-core/queue.h>
 #include <bmk-core/string.h>
@@ -236,15 +237,15 @@ static void
 stackalloc(void **stack, unsigned long *ss)
 {
 
-	*stack = bmk_platform_allocpg2(bmk_stackpageorder);
+	*stack = (void *)bmk_pgalloc(bmk_stackpageorder);
 	*ss = bmk_stacksize;
 }
 
 static void
 stackfree(struct bmk_thread *thread)
 {
 
-	bmk_platform_freepg2(thread->bt_stackbase, bmk_stackpageorder);
+	bmk_pgfree(thread->bt_stackbase, bmk_stackpageorder);
 }
 
 void

diff --git a/lib/libbmk_rumpuser/rumpuser_mem.c b/lib/libbmk_rumpuser/rumpuser_mem.c
@@ -26,6 +26,7 @@
 #include <bmk-core/core.h>
 #include <bmk-core/errno.h>
 #include <bmk-core/memalloc.h>
+#include <bmk-core/pgalloc.h>
 #include <bmk-core/null.h>
 
 #include <bmk-rumpuser/core_types.h>
@@ -54,7 +55,7 @@ rumpuser_malloc(size_t len, int alignment, void **retval)
 	 */
 	if (len == bmk_pagesize) {
 		bmk_assert((unsigned long)alignment <= bmk_pagesize);
-		*retval = bmk_platform_allocpg2(0);
+		*retval = (void *)bmk_pgalloc_one();
 	} else {
 		*retval = bmk_memalloc(len, alignment, BMK_MEMWHO_RUMPKERN);
 	}
@@ -69,7 +70,7 @@ rumpuser_free(void *buf, size_t buflen)
 {
 
 	if (buflen == bmk_pagesize)
-		bmk_platform_freepg2(buf, 0);
+		bmk_pgfree_one(buf);
 	else
 		bmk_memfree(buf, BMK_MEMWHO_RUMPKERN);
 }
diff --git a/platform/hw/kernel.c b/platform/hw/kernel.c
@@ -39,20 +39,6 @@
 unsigned long bmk_membase;
 unsigned long bmk_memsize;
 
-void *
-bmk_platform_allocpg2(int shift)
-{
-
-	return (void *)bmk_pgalloc(shift);
-}
-
-void
-bmk_platform_freepg2(void *mem, int shift)
-{
-
-	bmk_pgfree(mem, shift);
-}
-
 unsigned long
 bmk_platform_memsize(void)
 {

diff --git a/platform/xen/xen/kernel.c b/platform/xen/xen/kernel.c
@@ -87,20 +87,6 @@ bmk_platform_halt(const char *panicstring)
 	minios_do_halt(MINIOS_HALT_POWEROFF);
 }
 
-void *
-bmk_platform_allocpg2(int shift)
-{
-
-	return (void *)bmk_pgalloc(shift);
-}
-
-void
-bmk_platform_freepg2(void *p, int shift)
-{
-
-	bmk_pgfree(p, shift);
-}
-
 void
 bmk_platform_block(bmk_time_t until)
 {