This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / arch / um / kernel / process_kern.c

diff --git a/arch/um/kernel/process_kern.c b/arch/um/kernel/process_kern.c
index 8eb2d3b..ea000e6 100644 (file)
--- a/arch/um/kernel/process_kern.c
+++ b/arch/um/kernel/process_kern.c
@@ -16,7 +16,6 @@
 #include "linux/module.h"
 #include "linux/init.h"
 #include "linux/capability.h"
-#include "linux/vmalloc.h"
 #include "linux/spinlock.h"
 #include "asm/unistd.h"
 #include "asm/mman.h"
@@ -165,6 +164,8 @@ int copy_thread(int nr, unsigned long clone_flags, unsigned long sp,
                struct pt_regs *regs)
 {
        p->thread = (struct thread_struct) INIT_THREAD;
+       p->thread.kernel_stack = 
+               (unsigned long) p->thread_info + 2 * PAGE_SIZE;
        return(CHOOSE_MODE_PROC(copy_thread_tt, copy_thread_skas, nr, 
                                clone_flags, sp, stack_top, p, regs));
 }
@@ -300,11 +301,6 @@ void *um_kmalloc_atomic(int size)
        return(kmalloc(size, GFP_ATOMIC));
 }
 
-void *um_vmalloc(int size)
-{
-       return(vmalloc(size));
-}
-
 unsigned long get_fault_addr(void)
 {
        return((unsigned long) current->thread.fault_addr);
@@ -324,7 +320,8 @@ int user_context(unsigned long sp)
        unsigned long stack;
 
        stack = sp & (PAGE_MASK << CONFIG_KERNEL_STACK_ORDER);
-       return(stack != (unsigned long) current_thread);
+       stack += 2 * PAGE_SIZE;
+       return(stack != current->thread.kernel_stack);
 }
 
 extern void remove_umid_dir(void);