uml: get rid of syscall counters

[linux-2.6-omap-h63xx.git] / arch / um / kernel / skas / syscall.c

diff --git a/arch/um/kernel/skas/syscall.c b/arch/um/kernel/skas/syscall.c
index 51fb94076fcf92628c6e06674051bd1de232a934..6450f024290fd3c034d47bd0f2813bcc8ee20e08 100644 (file)
--- a/arch/um/kernel/skas/syscall.c
+++ b/arch/um/kernel/skas/syscall.c
@@ -1,34 +1,24 @@
 /*
- * Copyright (C) 2002 Jeff Dike (jdike@karaya.com)
+ * Copyright (C) 2002 - 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com)
  * Licensed under the GPL
  */
 
-#include "linux/sys.h"
+#include "linux/kernel.h"
 #include "linux/ptrace.h"
-#include "asm/errno.h"
-#include "asm/unistd.h"
-#include "asm/ptrace.h"
-#include "asm/current.h"
-#include "sysdep/syscalls.h"
 #include "kern_util.h"
-#include "syscall.h"
+#include "sysdep/ptrace.h"
+#include "sysdep/syscalls.h"
 
-void handle_syscall(union uml_pt_regs *r)
+void handle_syscall(struct 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++;
-       nsyscalls++;
-
-       /* This should go in the declaration of syscall, but when I do that,
+       /*
+        * This should go in the declaration of syscall, but when I do that,
         * strace -f -c bash -c 'ls ; ls' breaks, sometimes not tracing
         * children at all, sometimes hanging when bash doesn't see the first
         * ls exit.
@@ -37,14 +27,11 @@ void handle_syscall(union uml_pt_regs *r)
         * in case it's a compiler bug.
         */
        syscall = UPT_SYSCALL_NR(r);
-       if((syscall >= NR_syscalls) || (syscall < 0))
+       if ((syscall >= NR_syscalls) || (syscall < 0))
                result = -ENOSYS;
        else result = EXECUTE_SYSCALL(syscall, regs);
 
-       REGS_SET_SYSCALL_RETURN(r->skas.regs, result);
+       REGS_SET_SYSCALL_RETURN(r->gp, result);
 
        syscall_trace(r, 1);
-#ifdef UML_CONFIG_SYSCALL_DEBUG
-       record_syscall_end(index, result);
-#endif
 }