From 7e176f23511446bc33f4e43fd098ddb73acd8146 Mon Sep 17 00:00:00 2001
From: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Mon, 16 Aug 2021 13:18:50 +0200
Subject: 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.
---
 mach-defpager/main.c | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'mach-defpager/main.c')

diff --git a/mach-defpager/main.c b/mach-defpager/main.c
index 71615c8f..67d4c585 100644
--- a/mach-defpager/main.c
+++ b/mach-defpager/main.c
@@ -32,6 +32,7 @@
 #include <error.h>
 #include <signal.h>
 #include <string.h>
+#include <sys/mman.h>
 
 /* XXX */
 #include <fcntl.h>
@@ -89,6 +90,10 @@ main (int argc, char **argv)
   if (err)
     error (1, err, "cannot get privileged ports");
 
+  err = mlockall(MCL_CURRENT | MCL_FUTURE);
+  if (err)
+    error (1, err, "cannot lock all memory");
+
   defpager = MACH_PORT_NULL;
   err = vm_set_default_memory_manager (bootstrap_master_host_port, &defpager);
   if (err)
-- 
cgit v1.2.3