Merge branch 'master'

5 files changed, 10 insertions, 49 deletions

diff --git a/arch/um/kernel/tt/exec_kern.c b/arch/um/kernel/tt/exec_kern.c
index 5c1e4cc1c049..ad66df17d9d7 100644
--- a/arch/um/kernel/tt/exec_kern.c
+++ b/arch/um/kernel/tt/exec_kern.c
@@ -21,7 +21,7 @@
 static int exec_tramp(void *sig_stack)
 {
         init_new_thread_stack(sig_stack, NULL);
-        init_new_thread_signals(1);
+        init_new_thread_signals();
         os_stop_process(os_getpid());
         return(0);
 }
diff --git a/arch/um/kernel/tt/mem.c b/arch/um/kernel/tt/mem.c
index bcb8796c3cb1..84a23b14f770 100644
--- a/arch/um/kernel/tt/mem.c
+++ b/arch/um/kernel/tt/mem.c
@@ -24,22 +24,13 @@ void before_mem_tt(unsigned long brk_start)
 #define SIZE ((CONFIG_NEST_LEVEL + CONFIG_KERNEL_HALF_GIGS) * 0x20000000)
 #define START (CONFIG_TOP_ADDR - SIZE)
 
-unsigned long set_task_sizes_tt(int arg, unsigned long *host_size_out, 
-                                unsigned long *task_size_out)
+unsigned long set_task_sizes_tt(unsigned long *task_size_out)
 {
+        unsigned long host_task_size;
+
         /* Round up to the nearest 4M */
-        *host_size_out = ROUND_4M((unsigned long) &arg);
+        host_task_size = ROUND_4M((unsigned long) &host_task_size);
         *task_size_out = START;
-        return(START);
-}
 
-/*
- * Overrides for Emacs so that we follow Linus's tabbing style.
- * Emacs will notice this stuff at the end of the file and automatically
- * adjust the settings for this buffer only.  This must remain at the end
- * of the file.
- * ---------------------------------------------------------------------------
- * Local variables:
- * c-file-style: "linux"
- * End:
- */
+        return host_task_size;
+}
diff --git a/arch/um/kernel/tt/process_kern.c b/arch/um/kernel/tt/process_kern.c
index 8368c2dbe635..1e86f0bfef72 100644
--- a/arch/um/kernel/tt/process_kern.c
+++ b/arch/um/kernel/tt/process_kern.c
@@ -142,7 +142,7 @@ static void new_thread_handler(int sig)
                 schedule_tail(current->thread.prev_sched);
         current->thread.prev_sched = NULL;
 
-        init_new_thread_signals(1);
+        init_new_thread_signals();
         enable_timer();
         free_page(current->thread.temp_stack);
         set_cmdline("(kernel thread)");
diff --git a/arch/um/kernel/tt/syscall_kern.c b/arch/um/kernel/tt/syscall_kern.c
index 3fda9a03c59a..293caa6d0c2d 100644
--- a/arch/um/kernel/tt/syscall_kern.c
+++ b/arch/um/kernel/tt/syscall_kern.c
@@ -21,18 +21,11 @@ void syscall_handler_tt(int sig, struct pt_regs *regs)
         void *sc;
         long result;
         int syscall;
-#ifdef CONFIG_SYSCALL_DEBUG
-        int index;
-#endif
+
         sc = UPT_SC(&regs->regs);
         SC_START_SYSCALL(sc);
 
         syscall = UPT_SYSCALL_NR(&regs->regs);
-
-#ifdef CONFIG_SYSCALL_DEBUG
-        index = record_syscall_start(syscall);
-#endif
-
         syscall_trace(&regs->regs, 0);
 
         current->thread.nsyscalls++;
@@ -50,7 +43,4 @@ void syscall_handler_tt(int sig, struct pt_regs *regs)
         SC_SET_SYSCALL_RETURN(sc, result);
 
         syscall_trace(&regs->regs, 1);
-#ifdef CONFIG_SYSCALL_DEBUG
-        record_syscall_end(index, result);
-#endif
 }
diff --git a/arch/um/kernel/tt/tracer.c b/arch/um/kernel/tt/tracer.c
index 71daae24e48a..9882342206ec 100644
--- a/arch/um/kernel/tt/tracer.c
+++ b/arch/um/kernel/tt/tracer.c
@@ -188,10 +188,7 @@ int tracer(int (*init_proc)(void *), void *sp)
         int status, pid = 0, sig = 0, cont_type, tracing = 0, op = 0;
         int proc_id = 0, n, err, old_tracing = 0, strace = 0;
         int local_using_sysemu = 0;
-#ifdef UML_CONFIG_SYSCALL_DEBUG
-        unsigned long eip = 0;
-        int last_index;
-#endif
+
         signal(SIGPIPE, SIG_IGN);
         setup_tracer_winch();
         tracing_pid = os_getpid();
@@ -282,23 +279,6 @@ int tracer(int (*init_proc)(void *), void *sp)
                 else if(WIFSTOPPED(status)){
                         proc_id = pid_to_processor_id(pid);
                         sig = WSTOPSIG(status);
-#ifdef UML_CONFIG_SYSCALL_DEBUG
-                        if(signal_index[proc_id] == 1024){
-                                signal_index[proc_id] = 0;
-                                last_index = 1023;
-                        }
-                        else last_index = signal_index[proc_id] - 1;
-                        if(((sig == SIGPROF) || (sig == SIGVTALRM) ||
-                            (sig == SIGALRM)) &&
-                           (signal_record[proc_id][last_index].signal == sig)&&
-                           (signal_record[proc_id][last_index].pid == pid))
-                                signal_index[proc_id] = last_index;
-                        signal_record[proc_id][signal_index[proc_id]].pid = pid;
-                        gettimeofday(&signal_record[proc_id][signal_index[proc_id]].time, NULL);
-                        eip = ptrace(PTRACE_PEEKUSR, pid, PT_IP_OFFSET, 0);
-                        signal_record[proc_id][signal_index[proc_id]].addr = eip;
-                        signal_record[proc_id][signal_index[proc_id]++].signal = sig;
-#endif
                         if(proc_id == -1){
                                 sleeping_process_signal(pid, sig);
                                 continue;