uml: get rid of syscall counters

Get rid of some syscall counters which haven't been useful in ages.

Signed-off-by: Jeff Dike <jdike@linux.intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/arch/um/include/kern_util.h b/arch/um/include/kern_util.h
index 715ffb5..3c34122 100644 (file)
--- a/arch/um/include/kern_util.h
+++ b/arch/um/include/kern_util.h
@@ -13,7 +13,6 @@ extern int uml_exitcode;
 
 extern int ncpus;
 extern int kmalloc_ok;
-extern int nsyscalls;
 
 #define UML_ROUND_UP(addr) \
        ((((unsigned long) addr) + PAGE_SIZE - 1) & PAGE_MASK)

diff --git a/arch/um/kernel/skas/syscall.c b/arch/um/kernel/skas/syscall.c
index 50b476f..6450f02 100644 (file)
--- a/arch/um/kernel/skas/syscall.c
+++ b/arch/um/kernel/skas/syscall.c
@@ -17,9 +17,6 @@ void handle_syscall(struct uml_pt_regs *r)
 
        syscall_trace(r, 0);
 
-       current->thread.nsyscalls++;
-       nsyscalls++;
-
        /*
         * This should go in the declaration of syscall, but when I do that,
         * strace -f -c bash -c 'ls ; ls' breaks, sometimes not tracing

diff --git a/arch/um/kernel/syscall.c b/arch/um/kernel/syscall.c
index b9d92b2..9cffc62 100644 (file)
--- a/arch/um/kernel/syscall.c
+++ b/arch/um/kernel/syscall.c
@@ -13,9 +13,6 @@
 #include "asm/uaccess.h"
 #include "asm/unistd.h"
 
-/*  Unlocked, I don't care if this is a bit off */
-int nsyscalls = 0;
-
 long sys_fork(void)
 {
        long ret;

diff --git a/include/asm-um/processor-generic.h b/include/asm-um/processor-generic.h
index ecf6706..b7d9a16 100644 (file)
--- a/include/asm-um/processor-generic.h
+++ b/include/asm-um/processor-generic.h
@@ -27,7 +27,6 @@ struct thread_struct {
         * as of 2.6.11).
         */
        int forking;
-       int nsyscalls;
        struct pt_regs regs;
        int singlestep_syscall;
        void *fault_addr;
@@ -59,7 +58,6 @@ struct thread_struct {
 #define INIT_THREAD \
 { \
        .forking                = 0, \
-       .nsyscalls              = 0, \
        .regs                   = EMPTY_REGS,   \
        .fault_addr             = NULL, \
        .prev_sched             = NULL, \