summaryrefslogtreecommitdiff
path: root/init
diff options
context:
space:
mode:
Diffstat (limited to 'init')
-rw-r--r--init/ChangeLog6
-rw-r--r--init/init.c8
2 files changed, 9 insertions, 5 deletions
diff --git a/init/ChangeLog b/init/ChangeLog
index b4499c4a..a5fcfd46 100644
--- a/init/ChangeLog
+++ b/init/ChangeLog
@@ -1,3 +1,9 @@
+1999-07-03 Thomas Bushnell, BSG <tb@mit.edu>
+
+ * init.c (reboot_system): Use munmap instead of vm_deallocate.
+ (frob_kernel_process): Likewise.
+ (kill_everyone): Likewise.
+
1999-06-19 Roland McGrath <roland@baalperazim.frob.com>
* Makefile (HURDLIBS): Add ports and fshelp only if $(split-init)!=yes.
diff --git a/init/init.c b/init/init.c
index f5c2dbd8..25b19521 100644
--- a/init/init.c
+++ b/init/init.c
@@ -285,8 +285,7 @@ reboot_system (int flags)
task_terminate (task);
}
if (noise_len > 0)
- vm_deallocate (mach_task_self (),
- (vm_address_t)noise, noise_len);
+ munmap (noise, noise_len);
}
}
printf ("%s: Killing proc server\n", program_invocation_short_name);
@@ -1033,7 +1032,7 @@ frob_kernel_process (void)
/* We have the data all set up in our copy, now just write it over. */
err = vm_write (task, his, mine, windowsz);
mach_port_deallocate (mach_task_self (), task);
- vm_deallocate (mach_task_self (), mine, windowsz);
+ munmap ((caddr_t) mine, windowsz);
if (err)
{
error (0, err, "cannot write command line into kernel task");
@@ -1431,8 +1430,7 @@ kill_everyone (int signo)
}
}
if (pids != pidbuf)
- vm_deallocate (mach_task_self (), (vm_address_t) pids,
- npids * sizeof (pid_t));
+ munmap (pids, npids * sizeof (pid_t));
if (!didany)
return 1;
}