Merge /pub/scm/linux/kernel/git/torvalds/linux-2.6

1 files changed, 11 insertions, 4 deletions

diff --git a/arch/um/kernel/skas/process.c b/arch/um/kernel/skas/process.c
index ae4fa71d3b8b..2a69a7ce5792 100644
--- a/arch/um/kernel/skas/process.c
+++ b/arch/um/kernel/skas/process.c
@@ -13,9 +13,9 @@
 #include "asm/uaccess.h"
 #include "asm/atomic.h"
 #include "kern_util.h"
+#include "as-layout.h"
 #include "skas.h"
 #include "os.h"
-#include "user_util.h"
 #include "tlb.h"
 #include "kern.h"
 #include "mode.h"
@@ -163,8 +163,12 @@ static int start_kernel_proc(void *unused)
 
 extern int userspace_pid[];
 
+extern char cpu0_irqstack[];
+
 int start_uml_skas(void)
 {
+        stack_protections((unsigned long) &cpu0_irqstack);
+        set_sigstack(cpu0_irqstack, THREAD_SIZE);
         if(proc_mm)
                 userspace_pid[0] = start_userspace(0);
 
@@ -178,20 +182,23 @@ int start_uml_skas(void)
 
 int external_pid_skas(struct task_struct *task)
 {
-#warning Need to look up userspace_pid by cpu
+        /* FIXME: Need to look up userspace_pid by cpu */
         return(userspace_pid[0]);
 }
 
 int thread_pid_skas(struct task_struct *task)
 {
-#warning Need to look up userspace_pid by cpu
+        /* FIXME: Need to look up userspace_pid by cpu */
         return(userspace_pid[0]);
 }
 
 void kill_off_processes_skas(void)
 {
         if(proc_mm)
-#warning need to loop over userspace_pids in kill_off_processes_skas
+                /*
+                 * FIXME: need to loop over userspace_pids in
+                 * kill_off_processes_skas
+                 */
                 os_kill_ptraced_process(userspace_pid[0], 1);
         else {
                 struct task_struct *p;