Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

[linux-2.6-omap-h63xx.git] / arch / um / kernel / init_task.c

diff --git a/arch/um/kernel/init_task.c b/arch/um/kernel/init_task.c
index d4f1d1ab252ba0757e47499db066bdb09cbf62bc..dcfceca950523ce7b1e7ebba36994d2816d071ca 100644 (file)
--- a/arch/um/kernel/init_task.c
+++ b/arch/um/kernel/init_task.c
@@ -3,15 +3,12 @@
  * Licensed under the GPL
  */
 
-#include "linux/mm.h"
-#include "linux/module.h"
 #include "linux/sched.h"
 #include "linux/init_task.h"
+#include "linux/fs.h"
+#include "linux/module.h"
 #include "linux/mqueue.h"
 #include "asm/uaccess.h"
-#include "asm/pgtable.h"
-#include "mem_user.h"
-#include "os.h"
 
 static struct fs_struct init_fs = INIT_FS;
 struct mm_struct init_mm = INIT_MM(init_mm);
@@ -45,8 +42,3 @@ union thread_union init_thread_union
 union thread_union cpu0_irqstack
        __attribute__((__section__(".data.init_irqstack"))) =
                { INIT_THREAD_INFO(init_task) };
-
-void unprotect_stack(unsigned long stack)
-{
-       os_protect_memory((void *) stack, THREAD_SIZE, 1, 1, 0);
-}