summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Dike <jdike@addtoit.com>2005-05-28 15:51:54 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-05-28 16:46:11 -0700
commit6770cb61ff6d557613a8382b28f9b0a919fb112f (patch)
treebc6c53e976da3c8141d99b5b9fd68d708951f5ce
parentb9e0d0696c9e86d4e40b23039feefb8c377cb524 (diff)
downloadlinux-3.10-6770cb61ff6d557613a8382b28f9b0a919fb112f.tar.gz
linux-3.10-6770cb61ff6d557613a8382b28f9b0a919fb112f.tar.bz2
linux-3.10-6770cb61ff6d557613a8382b28f9b0a919fb112f.zip
[PATCH] uml: turn off kmalloc always on a fatal signal
We should turn off kmalloc when getting a fatal signal regardless of the mode we're in. Signed-off-by: Jeff Dike <jdike@addtoit.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--arch/um/kernel/main.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/um/kernel/main.c b/arch/um/kernel/main.c
index a17c49703f9..939e3b70867 100644
--- a/arch/um/kernel/main.c
+++ b/arch/um/kernel/main.c
@@ -71,7 +71,7 @@ static __init void do_uml_initcalls(void)
static void last_ditch_exit(int sig)
{
- CHOOSE_MODE(kmalloc_ok = 0, (void) 0);
+ kmalloc_ok = 0;
signal(SIGINT, SIG_DFL);
signal(SIGTERM, SIG_DFL);
signal(SIGHUP, SIG_DFL);