7 files changed, 2 insertions, 86 deletions

diff --git a/arch/um/Kconfig.debug b/arch/um/Kconfig.debug
index bab51d619173..09c1aca6339f 100644
--- a/arch/um/Kconfig.debug
+++ b/arch/um/Kconfig.debug
@@ -47,13 +47,4 @@ config GCOV
         If you're involved in UML kernel development and want to use gcov,
         say Y.  If you're unsure, say N.
 
-config SYSCALL_DEBUG
-        bool "Enable system call debugging"
-        depends on DEBUG_INFO
-        help
-        This adds some system debugging to UML, including keeping a ring buffer
-        with recent system calls and some global and per-task statistics.
-
-        If unsure, say N
-
 endmenu
diff --git a/arch/um/defconfig b/arch/um/defconfig
index 402a74dc5026..780cc0a4a128 100644
--- a/arch/um/defconfig
+++ b/arch/um/defconfig
@@ -526,4 +526,3 @@ CONFIG_FORCED_INLINING=y
 # CONFIG_RCU_TORTURE_TEST is not set
 # CONFIG_GPROF is not set
 # CONFIG_GCOV is not set
-# CONFIG_SYSCALL_DEBUG is not set
diff --git a/arch/um/kernel/Makefile b/arch/um/kernel/Makefile
index fe08971b64cf..82b435897256 100644
--- a/arch/um/kernel/Makefile
+++ b/arch/um/kernel/Makefile
@@ -15,7 +15,6 @@ obj-y = config.o exec_kern.o exitcode.o \
 obj-$(CONFIG_BLK_DEV_INITRD) += initrd.o
 obj-$(CONFIG_GPROF)     += gprof_syms.o
 obj-$(CONFIG_GCOV)      += gmon_syms.o
-obj-$(CONFIG_SYSCALL_DEBUG) += syscall.o
 
 obj-$(CONFIG_MODE_TT) += tt/
 obj-$(CONFIG_MODE_SKAS) += skas/
diff --git a/arch/um/kernel/skas/syscall.c b/arch/um/kernel/skas/syscall.c
index 51fb94076fcf..0ae4eea21be4 100644
--- a/arch/um/kernel/skas/syscall.c
+++ b/arch/um/kernel/skas/syscall.c
@@ -18,11 +18,7 @@ void handle_syscall(union uml_pt_regs *r)
         struct pt_regs *regs = container_of(r, struct pt_regs, regs);
         long result;
         int syscall;
-#ifdef UML_CONFIG_SYSCALL_DEBUG
-        int index;
 
-        index = record_syscall_start(UPT_SYSCALL_NR(r));
-#endif
         syscall_trace(r, 0);
 
         current->thread.nsyscalls++;
@@ -44,7 +40,4 @@ void handle_syscall(union uml_pt_regs *r)
         REGS_SET_SYSCALL_RETURN(r->skas.regs, result);
 
         syscall_trace(r, 1);
-#ifdef UML_CONFIG_SYSCALL_DEBUG
-        record_syscall_end(index, result);
-#endif
 }
diff --git a/arch/um/kernel/syscall.c b/arch/um/kernel/syscall.c
deleted file mode 100644
index 1731d90e6850..000000000000
--- a/arch/um/kernel/syscall.c
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (C) 2002 Jeff Dike (jdike@karaya.com)
- * Licensed under the GPL
- */
-
-#include "kern_util.h"
-#include "syscall.h"
-#include "os.h"
-
-struct {
-        int syscall;
-        int pid;
-        long result;
-        unsigned long long start;
-        unsigned long long end;
-} syscall_record[1024];
-
-int record_syscall_start(int syscall)
-{
-        int max, index;
-
-        max = sizeof(syscall_record)/sizeof(syscall_record[0]);
-        index = next_syscall_index(max);
-
-        syscall_record[index].syscall = syscall;
-        syscall_record[index].pid = current_pid();
-        syscall_record[index].result = 0xdeadbeef;
-        syscall_record[index].start = os_nsecs();
-        return(index);
-}
-
-void record_syscall_end(int index, long result)
-{
-        syscall_record[index].result = result;
-        syscall_record[index].end = os_nsecs();
-}
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;