upgrade to fedora-2.6.12-1.1398.FC4 + vserver 2.0.rc7

[linux-2.6.git] / arch / um / kernel / tt / syscall_user.c

diff --git a/arch/um/kernel/tt/syscall_user.c b/arch/um/kernel/tt/syscall_user.c
index b06217d..b218316 100644 (file)
--- a/arch/um/kernel/tt/syscall_user.c
+++ b/arch/um/kernel/tt/syscall_user.c
@@ -6,7 +6,6 @@
 #include <unistd.h>
 #include <signal.h>
 #include <errno.h>
-#include <sys/ptrace.h>
 #include <asm/unistd.h>
 #include "sysdep/ptrace.h"
 #include "sigcontext.h"
@@ -22,15 +21,20 @@ void syscall_handler_tt(int sig, union uml_pt_regs *regs)
 {
        void *sc;
        long result;
-       int index, syscall;
+       int syscall;
+#ifdef UML_CONFIG_DEBUG_SYSCALL
+       int index;
+#endif
 
        syscall = UPT_SYSCALL_NR(regs);
        sc = UPT_SC(regs);
        SC_START_SYSCALL(sc);
 
-       index = record_syscall_start(syscall);
+#ifdef UML_CONFIG_DEBUG_SYSCALL
+       index = record_syscall_start(syscall);
+#endif
        syscall_trace(regs, 0);
-       result = execute_syscall(regs);
+       result = execute_syscall_tt(regs);
 
        /* regs->sc may have changed while the system call ran (there may
         * have been an interrupt or segfault), so it needs to be refreshed.
@@ -40,38 +44,42 @@ void syscall_handler_tt(int sig, union uml_pt_regs *regs)
        SC_SET_SYSCALL_RETURN(sc, result);
 
        syscall_trace(regs, 1);
-       record_syscall_end(index, result);
+#ifdef UML_CONFIG_DEBUG_SYSCALL
+       record_syscall_end(index, result);
+#endif
 }
 
-int do_syscall(void *task, int pid, int local_using_sysemu)
+void do_sigtrap(void *task)
+{
+       UPT_SYSCALL_NR(TASK_REGS(task)) = -1;
+}
+
+void do_syscall(void *task, int pid, int local_using_sysemu)
 {
        unsigned long proc_regs[FRAME_SIZE];
-       union uml_pt_regs *regs;
-       int syscall;
 
        if(ptrace_getregs(pid, proc_regs) < 0)
                tracer_panic("Couldn't read registers");
-       syscall = PT_SYSCALL_NR(proc_regs);
 
-       regs = TASK_REGS(task);
-       UPT_SYSCALL_NR(regs) = syscall;
+       UPT_SYSCALL_NR(TASK_REGS(task)) = PT_SYSCALL_NR(proc_regs);
 
-       if(syscall < 0)
-               return(0);
+#ifdef UPT_ORIGGPR2
+        UPT_ORIGGPR2(TASK_REGS(task)) = REGS_ORIGGPR2(proc_regs);
+#endif
 
-       if((syscall != __NR_sigreturn) &&
-          ((unsigned long *) PT_IP(proc_regs) >= &_stext) && 
+       if(((unsigned long *) PT_IP(proc_regs) >= &_stext) &&
           ((unsigned long *) PT_IP(proc_regs) <= &_etext))
                tracer_panic("I'm tracing myself and I can't get out");
 
-       if(local_using_sysemu)
-               return(1);
+       /* advanced sysemu mode set syscall number to -1 automatically */
+       if (local_using_sysemu==2)
+               return;
 
-       if(ptrace(PTRACE_POKEUSER, pid, PT_SYSCALL_NR_OFFSET, 
-                 __NR_getpid) < 0)
+       /* syscall number -1 in sysemu skips syscall restarting in host */
+       if(ptrace(PTRACE_POKEUSR, pid, PT_SYSCALL_NR_OFFSET,
+                 local_using_sysemu ? -1 : __NR_getpid) < 0)
                tracer_panic("do_syscall : Nullifying syscall failed, "
                             "errno = %d", errno);
-       return(1);
 }
 
 /*