mach-defpager: Drop kalloc/kfree

glibc is removing its malloc hooks, but gnumach now has support for
mlockall, which we can just use instead of kalloc/kfree.

* mach-defpager/main.c (main): Call mlockall.
* mach-defpager/kalloc.c: Remove.
* mach-defpager/kalloc.h: Remove.
* mach-defpager/default_pager.c: Use malloc/free instead of
  kalloc/kfree.
* mach-defpager/setup.c: Likewise.

1 files changed, 5 insertions, 5 deletions

diff --git a/mach-defpager/setup.c b/mach-defpager/setup.c
index 94685c0e..0fc4d9d4 100644
--- a/mach-defpager/setup.c
+++ b/mach-defpager/setup.c
@@ -24,9 +24,9 @@
 #include <mach.h>
 #include <string.h>
 #include <strings.h>
+#include <stdlib.h>
 
 #include "default_pager.h"
-#include "kalloc.h"
 
 #include "file_io.h"
 #include "default_pager_S.h"
@@ -74,7 +74,7 @@ S_default_pager_paging_storage (mach_port_t pager,
     /* We can't write disk blocks larger than pages.  */
     return EINVAL;
 
-  fdp = kalloc (offsetof (struct file_direct, runs[nrun]));
+  fdp = malloc (offsetof (struct file_direct, runs[nrun]));
   if (fdp == 0)
     return ENOMEM;
 
@@ -89,7 +89,7 @@ S_default_pager_paging_storage (mach_port_t pager,
       fdp->runs[i].length = runs[i + 1];
       if (fdp->runs[i].start + fdp->runs[i].length > devsize)
 	{
-	  kfree (fdp, offsetof (struct file_direct, runs[nrun]));
+	  free (fdp);
 	  return EINVAL;
 	}
       fdp->fd_size += fdp->runs[i].length;
@@ -269,7 +269,7 @@ add_paging_file(master_device_port, file_name, linux_signature)
   else
     {
       struct file_direct *fdp;
-      fdp = kalloc (offsetof (struct file_direct, runs[1]));
+      fdp = malloc (offsetof (struct file_direct, runs[1]));
       if (fdp == 0)
 	return ENOMEM;
 
@@ -301,7 +301,7 @@ remove_paging_file (char *file_name)
   if (kr == KERN_SUCCESS && fdp != 0)
     {
       mach_port_deallocate (mach_task_self (), fdp->device);
-      kfree (fdp, (char *) &fdp->runs[fdp->nruns] - (char *) fdp);
+      free (fdp);
     }
   return kr;
 }