[PATCH] uml: generic singlestep syscall

From: Bodo Stroesser - Make singlestep_syscall generic rather than being
restricted to tt mode.
Signed-off-by: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

arch/um/kernel/signal_kern.c

@@ -154,7 +154,7 @@ static int kern_do_signal(struct pt_regs *regs, sigset_t *oldset)
 	 */
 	if((current->ptrace & PT_DTRACE) && 
 	   is_syscall(PT_REGS_IP(&current->thread.regs)))
- 		(void) CHOOSE_MODE(current->thread.mode.tt.singlestep_syscall = 1, 0);
+		current->thread.singlestep_syscall = 1;
 	return(0);
 }
 

arch/um/kernel/tt/process_kern.c

@@ -527,7 +527,7 @@ int singlestepping_tt(void *t)
 {
 	struct task_struct *task = t;
 
-	if(task->thread.mode.tt.singlestep_syscall)
+	if(task->thread.singlestep_syscall)
 		return(0);
 	return(task->ptrace & PT_DTRACE);
 }

arch/um/kernel/tt/syscall_kern.c

@@ -123,8 +123,8 @@ long execute_syscall_tt(void *r)
 
 	set_fs(USER_DS);
 
-	if(current->thread.mode.tt.singlestep_syscall){
-		current->thread.mode.tt.singlestep_syscall = 0;
+	if(current->thread.singlestep_syscall){
+		current->thread.singlestep_syscall = 0;
 		current->ptrace &= ~PT_DTRACE;
 		force_sig(SIGTRAP, current);
 	}

include/asm-um/processor-generic.h

@@ -25,6 +25,7 @@ struct thread_struct {
 	unsigned long cr2;
 	int err;
 	unsigned long trap_no;
+	int singlestep_syscall;
 	void *fault_addr;
 	void *fault_catcher;
 	struct task_struct *prev_sched;
@@ -37,7 +38,6 @@ struct thread_struct {
 			int extern_pid;
 			int tracing;
 			int switch_pipe[2];
-			int singlestep_syscall;
 			int vm_seq;
 		} tt;
 #endif