mirror of
https://github.com/genesi/linux-legacy.git
synced 2026-05-19 02:12:43 +00:00
[PATCH] uml: always disable kmalloc during shutdown
kmalloc wasn't being disabled during panic. This patch ensures that, no matter how UML is exiting, it is disabled. This matters because part of the cleanup is to remove the umid file, which involves readdir, which calls malloc. This must map to libc malloc, rather than kmalloc or vmalloc. Signed-off-by: Jeff Dike <jdike@addtoit.com> Cc: Paolo Giarrusso <blaisorblade@yahoo.it> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
committed by
Linus Torvalds
parent
a6f4e3cf75
commit
026549d284
@@ -38,14 +38,14 @@ static void kill_off_processes(void)
|
||||
|
||||
void uml_cleanup(void)
|
||||
{
|
||||
kill_off_processes();
|
||||
kmalloc_ok = 0;
|
||||
do_uml_exitcalls();
|
||||
kill_off_processes();
|
||||
}
|
||||
|
||||
void machine_restart(char * __unused)
|
||||
{
|
||||
do_uml_exitcalls();
|
||||
kill_off_processes();
|
||||
uml_cleanup();
|
||||
CHOOSE_MODE(reboot_tt(), reboot_skas());
|
||||
}
|
||||
|
||||
@@ -53,8 +53,7 @@ EXPORT_SYMBOL(machine_restart);
|
||||
|
||||
void machine_power_off(void)
|
||||
{
|
||||
do_uml_exitcalls();
|
||||
kill_off_processes();
|
||||
uml_cleanup();
|
||||
CHOOSE_MODE(halt_tt(), halt_skas());
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user