Automatic merge with /usr/src/ntfs-2.6.git.

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

diff --git a/arch/um/kernel/ptrace.c b/arch/um/kernel/ptrace.c
index ec19fed7c64b6f398f372eca58d6859ba8db24bf..71af4d5038994014f12e5030dd3187bcbaae9450 100644 (file)
--- a/arch/um/kernel/ptrace.c
+++ b/arch/um/kernel/ptrace.c
@@ -19,15 +19,30 @@
 #include "skas_ptrace.h"
 #include "sysdep/ptrace.h"
 
+static inline void set_singlestepping(struct task_struct *child, int on)
+{
+        if (on)
+                child->ptrace |= PT_DTRACE;
+        else
+                child->ptrace &= ~PT_DTRACE;
+        child->thread.singlestep_syscall = 0;
+
+#ifdef SUBARCH_SET_SINGLESTEPPING
+        SUBARCH_SET_SINGLESTEPPING(child, on);
+#endif
+}
+
 /*
  * Called by kernel/ptrace.c when detaching..
  */
 void ptrace_disable(struct task_struct *child)
 { 
-       child->ptrace &= ~PT_DTRACE;
-       child->thread.singlestep_syscall = 0;
+        set_singlestepping(child,0);
 }
 
+extern int peek_user(struct task_struct * child, long addr, long data);
+extern int poke_user(struct task_struct * child, long addr, long data);
+
 long sys_ptrace(long request, long pid, long addr, long data)
 {
        struct task_struct *child;
@@ -67,6 +82,10 @@ long sys_ptrace(long request, long pid, long addr, long data)
                goto out_tsk;
        }
 
+#ifdef SUBACH_PTRACE_SPECIAL
+        SUBARCH_PTRACE_SPECIAL(child,request,addr,data);
+#endif
+
        ret = ptrace_check_attach(child, request == PTRACE_KILL);
        if (ret < 0)
                goto out_tsk;
@@ -87,28 +106,9 @@ long sys_ptrace(long request, long pid, long addr, long data)
        }
 
        /* read the word at location addr in the USER area. */
-       case PTRACE_PEEKUSR: {
-               unsigned long tmp;
-
-               ret = -EIO;
-               if ((addr & 3) || addr < 0) 
-                       break;
-
-               tmp = 0;  /* Default return condition */
-               if(addr < MAX_REG_OFFSET){
-                       tmp = getreg(child, addr);
-               }
-#if defined(CONFIG_UML_X86) && !defined(CONFIG_64BIT)
-               else if((addr >= offsetof(struct user, u_debugreg[0])) &&
-                       (addr <= offsetof(struct user, u_debugreg[7]))){
-                       addr -= offsetof(struct user, u_debugreg[0]);
-                       addr = addr >> 2;
-                       tmp = child->thread.arch.debugregs[addr];
-               }
-#endif
-               ret = put_user(tmp, (unsigned long __user *) data);
-               break;
-       }
+        case PTRACE_PEEKUSR:
+                ret = peek_user(child, addr, data);
+                break;
 
        /* when I and D space are separate, this will have to be fixed. */
        case PTRACE_POKETEXT: /* write the word at location addr. */
@@ -121,26 +121,8 @@ long sys_ptrace(long request, long pid, long addr, long data)
                break;
 
        case PTRACE_POKEUSR: /* write the word at location addr in the USER area */
-               ret = -EIO;
-               if ((addr & 3) || addr < 0)
-                       break;
-
-               if (addr < MAX_REG_OFFSET) {
-                       ret = putreg(child, addr, data);
-                       break;
-               }
-#if defined(CONFIG_UML_X86) && !defined(CONFIG_64BIT)
-               else if((addr >= offsetof(struct user, u_debugreg[0])) &&
-                       (addr <= offsetof(struct user, u_debugreg[7]))){
-                         addr -= offsetof(struct user, u_debugreg[0]);
-                         addr = addr >> 2;
-                         if((addr == 4) || (addr == 5)) break;
-                         child->thread.arch.debugregs[addr] = data;
-                         ret = 0;
-               }
-#endif
-
-               break;
+                ret = poke_user(child, addr, data);
+                break;
 
        case PTRACE_SYSCALL: /* continue and stop at next (return from) syscall */
        case PTRACE_CONT: { /* restart after signal. */
@@ -148,8 +130,7 @@ long sys_ptrace(long request, long pid, long addr, long data)
                if (!valid_signal(data))
                        break;
 
-               child->ptrace &= ~PT_DTRACE;
-               child->thread.singlestep_syscall = 0;
+                set_singlestepping(child, 0);
                if (request == PTRACE_SYSCALL) {
                        set_tsk_thread_flag(child, TIF_SYSCALL_TRACE);
                }
@@ -172,8 +153,7 @@ long sys_ptrace(long request, long pid, long addr, long data)
                if (child->exit_state == EXIT_ZOMBIE)   /* already dead */
                        break;
 
-               child->ptrace &= ~PT_DTRACE;
-               child->thread.singlestep_syscall = 0;
+                set_singlestepping(child, 0);
                child->exit_code = SIGKILL;
                wake_up_process(child);
                break;
@@ -184,8 +164,7 @@ long sys_ptrace(long request, long pid, long addr, long data)
                if (!valid_signal(data))
                        break;
                clear_tsk_thread_flag(child, TIF_SYSCALL_TRACE);
-               child->ptrace |= PT_DTRACE;
-               child->thread.singlestep_syscall = 0;
+                set_singlestepping(child, 1);
                child->exit_code = data;
                /* give it a chance to run. */
                wake_up_process(child);
@@ -263,11 +242,6 @@ long sys_ptrace(long request, long pid, long addr, long data)
                        break;
                break;
        }
-       case PTRACE_SIGPENDING:
-               ret = copy_to_user((unsigned long __user *) data,
-                                  &child->pending.signal,
-                                  sizeof(child->pending.signal));
-               break;
 
 #ifdef PTRACE_LDT
        case PTRACE_LDT: {
@@ -348,11 +322,9 @@ void syscall_trace(union uml_pt_regs *regs, int entryexit)
                                            UPT_SYSCALL_ARG2(regs),
                                            UPT_SYSCALL_ARG3(regs),
                                            UPT_SYSCALL_ARG4(regs));
-               else {
-                        int res = UPT_SYSCALL_RET(regs);
-                       audit_syscall_exit(current, AUDITSC_RESULT(res),
-                                           res);
-                }
+               else audit_syscall_exit(current,
+                                        AUDITSC_RESULT(UPT_SYSCALL_RET(regs)),
+                                        UPT_SYSCALL_RET(regs));
        }
 
        /* Fake a debug trap */
@@ -382,14 +354,3 @@ void syscall_trace(union uml_pt_regs *regs, int entryexit)
                current->exit_code = 0;
        }
 }
-
-/*
- * 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:
- */