Finished the skas merge by eliminating a syntax error, fixing the

new compilation warnings, and fixing a call to handle_page_fault.

arch/um/include/kern_util.h

@@ -75,6 +75,7 @@ extern void debugger_parent_signal(int status, int pid);
 extern void child_signal(int pid, int status);
 extern int init_ptrace_proxy(int idle_pid, int startup, int stop);
 extern int init_parent_proxy(int pid);
+extern int singlestepping(void *t);
 extern void check_stack_overflow(void *ptr);
 extern void relay_signal(int sig, struct uml_pt_regs *regs);
 extern void not_implemented(void);

arch/um/kernel/skas/include/mode_kern.h

@@ -34,7 +34,7 @@ extern unsigned long set_task_sizes_skas(int arg, unsigned long *host_size_out,
 extern int start_uml_skas(void);
 extern struct page *arch_validate_skas(struct page *page, int mask, int order);
 extern int external_pid_skas(struct task_struct *task);
-extern int thread_pid_skas(struct thread_struct *thread);
+extern int thread_pid_skas(struct task_struct *task);
 
 #define kmem_end_skas (host_task_size)
 

arch/um/kernel/skas/include/uaccess.h

@@ -37,7 +37,7 @@ static inline unsigned long maybe_map(unsigned long virt, int is_write)
 	int dummy_code;
 
 	if(IS_ERR(phys) || (is_write && !pte_write(pte))){
-		if(!handle_page_fault(virt, 0, is_write, 0, &dummy_code))
+		if(handle_page_fault(virt, 0, is_write, 0, &dummy_code))
 			return(0);
 		phys = um_virt_to_phys(current, virt, NULL);
 	}

arch/um/kernel/skas/process.c

@@ -298,7 +298,10 @@ void initial_thread_cb_skas(void (*proc)(void *), void *arg)
 	cb_back = &here;
 	if(setjmp(here) == 0)
 		longjmp(initial_jmpbuf, 2);
-	
+
+	cb_proc = NULL;
+	cb_arg = NULL;
+	cb_back = NULL;
 }
 
 void halt_skas(void)

arch/um/kernel/skas/process_kern.c

@@ -137,6 +137,7 @@ int copy_thread_skas(int nr, unsigned long clone_flags, unsigned long sp,
 void init_idle_skas(void)
 {
 	cpu_tasks[current->thread_info->cpu].pid = os_getpid();
+	default_idle();
 }
 
 extern void start_kernel(void);
@@ -177,7 +178,7 @@ int external_pid_skas(struct task_struct *task)
 	return(userspace_pid);
 }
 
-int thread_pid_skas(struct thread_struct *thread)
+int thread_pid_skas(struct task_struct *task)
 {
 	return(userspace_pid);
 }

arch/um/kernel/tt/exec_kern.c

@@ -9,6 +9,7 @@
 #include "asm/ptrace.h"
 #include "asm/uaccess.h"
 #include "asm/pgalloc.h"
+#include "asm/tlbflush.h"
 #include "user_util.h"
 #include "kern_util.h"
 #include "irq_user.h"

arch/um/kernel/tt/include/mode_kern.h

@@ -35,7 +35,7 @@ extern unsigned long set_task_sizes_tt(int arg, unsigned long *host_size_out,
 extern int start_uml_tt(void);
 extern struct page *arch_validate_tt(struct page *page, int mask, int order);
 extern int external_pid_tt(struct task_struct *task);
-extern int thread_pid_tt(struct thread_struct *thread);
+extern int thread_pid_tt(struct task_struct *task);
 
 #define kmem_end_tt (host_task_size - ABOVE_KMEM)
 

arch/um/kernel/tt/process_kern.c

@@ -9,6 +9,7 @@
 #include "asm/system.h"
 #include "asm/pgalloc.h"
 #include "asm/ptrace.h"
+#include "asm/tlbflush.h"
 #include "irq_user.h"
 #include "signal_user.h"
 #include "kern_util.h"
@@ -480,9 +481,9 @@ int external_pid_tt(struct task_struct *task)
 	return(task->thread.mode.tt.extern_pid);
 }
 
-int thread_pid_tt(struct thread_struct *thread)
+int thread_pid_tt(struct task_struct *task)
 {
-	return(thread->mode.tt.extern_pid);
+	return(task->thread.mode.tt.extern_pid);
 }
 
 int is_valid_pid(int pid)

arch/um/kernel/tt/ptproxy/ptrace.c

@@ -21,6 +21,7 @@ Jeff Dike (jdike@karaya.com) : Modified for integration into uml
 #include "user_util.h"
 #include "kern_util.h"
 #include "ptrace_user.h"
+#include "tt.h"
 
 long proxy_ptrace(struct debugger *debugger, int arg1, pid_t arg2,
 		  long arg3, long arg4, pid_t child, int *ret)

arch/um/kernel/um_arch.c

@@ -48,7 +48,7 @@ struct cpuinfo_um boot_cpu_data = {
 unsigned long thread_saved_pc(struct task_struct *task)
 {
 	return(os_process_pc(CHOOSE_MODE_PROC(thread_pid_tt, thread_pid_skas,
-					      thread)));
+					      task)));
 }
 
 static int show_cpuinfo(struct seq_file *m, void *v)
@@ -190,8 +190,8 @@ __uml_setup("ncpus=", uml_ncpus_setup,
 
 int force_tt = 0;
 
-if defined(CONFIG_MODE_TT) && defined(CONFIG_MODE_SKAS)
-+#define DEFAULT_TT 0
+#if defined(CONFIG_MODE_TT) && defined(CONFIG_MODE_SKAS)
+#define DEFAULT_TT 0
 
 static int __init mode_tt_setup(char *line, int *add)
 {