[PATCH] uml: avoid malloc to sleep in atomic sections

Ugly trick to help make malloc not sleeping - we can't do anything else.  But
this is not yet optimal, since spinlock don't trigger in_atomic() when
preemption is disabled.

Also, even if ugly, this was already used in one place, and was even more
bogus.  Fix it.

Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Cc: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 2 insertions, 2 deletions

diff --git a/arch/um/os-Linux/helper.c b/arch/um/os-Linux/helper.c
index 36cc8475bcda..6490a4ff40ac 100644
--- a/arch/um/os-Linux/helper.c
+++ b/arch/um/os-Linux/helper.c
@@ -60,7 +60,7 @@ int run_helper(void (*pre_exec)(void *), void *pre_data, char **argv,
 
         if((stack_out != NULL) && (*stack_out != 0))
                 stack = *stack_out;
-        else stack = alloc_stack(0, um_in_interrupt());
+        else stack = alloc_stack(0, __cant_sleep());
         if(stack == 0)
                 return(-ENOMEM);
 
@@ -124,7 +124,7 @@ int run_helper_thread(int (*proc)(void *), void *arg, unsigned int flags,
         unsigned long stack, sp;
         int pid, status, err;
 
-        stack = alloc_stack(stack_order, um_in_interrupt());
+        stack = alloc_stack(stack_order, __cant_sleep());
         if(stack == 0) return(-ENOMEM);
 
         sp = stack + (page_size() << stack_order) - sizeof(void *);