Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=38282764e3e76aa02c071af4673e6b6320e426ad
Commit:     38282764e3e76aa02c071af4673e6b6320e426ad
Parent:     8e3fe806e50d48d875bb56793ca3f984cba6c0db
Author:     David S. Miller <[EMAIL PROTECTED]>
AuthorDate: Wed Feb 6 22:01:01 2008 -0800
Committer:  David S. Miller <[EMAIL PROTECTED]>
CommitDate: Thu Feb 7 02:59:08 2008 -0800

    [SPARC]: Kill DEBUG_PTRACE code.
    
    It has long exceeded it's usefulness.
    
    Signed-off-by: David S. Miller <[EMAIL PROTECTED]>
---
 arch/sparc/kernel/ptrace.c   |   46 ------------------------------------------
 arch/sparc64/kernel/ptrace.c |   43 ---------------------------------------
 2 files changed, 0 insertions(+), 89 deletions(-)

diff --git a/arch/sparc/kernel/ptrace.c b/arch/sparc/kernel/ptrace.c
index c1e7e6a..0619958 100644
--- a/arch/sparc/kernel/ptrace.c
+++ b/arch/sparc/kernel/ptrace.c
@@ -236,19 +236,6 @@ failure:
 }
 
 /* #define ALLOW_INIT_TRACING */
-/* #define DEBUG_PTRACE */
-
-#ifdef DEBUG_PTRACE
-char *pt_rq [] = {
-       /* 0  */ "TRACEME", "PEEKTEXT", "PEEKDATA", "PEEKUSR",
-       /* 4  */ "POKETEXT", "POKEDATA", "POKEUSR", "CONT",
-       /* 8  */ "KILL", "SINGLESTEP", "SUNATTACH", "SUNDETACH",
-       /* 12 */ "GETREGS", "SETREGS", "GETFPREGS", "SETFPREGS",
-       /* 16 */ "READDATA", "WRITEDATA", "READTEXT", "WRITETEXT",
-       /* 20 */ "GETFPAREGS", "SETFPAREGS", "unknown", "unknown",
-       /* 24 */ "SYSCALL", ""
-};
-#endif
 
 /*
  * Called by kernel/ptrace.c when detaching..
@@ -552,23 +539,6 @@ asmlinkage void do_ptrace(struct pt_regs *regs)
        int ret;
 
        lock_kernel();
-#ifdef DEBUG_PTRACE
-       {
-               char *s;
-
-               if ((request >= 0) && (request <= 24))
-                       s = pt_rq [request];
-               else
-                       s = "unknown";
-
-               if (request == PTRACE_POKEDATA && data == 0x91d02001){
-                       printk ("do_ptrace: breakpoint pid=%d, addr=%08lx 
addr2=%08lx\n",
-                               pid, addr, addr2);
-               } else 
-                       printk("do_ptrace: rq=%s(%d) pid=%d addr=%08lx 
data=%08lx addr2=%08lx\n",
-                              s, (int) request, (int) pid, addr, data, addr2);
-       }
-#endif
 
        if (request == PTRACE_TRACEME) {
                ret = ptrace_traceme();
@@ -650,9 +620,6 @@ asmlinkage void do_ptrace(struct pt_regs *regs)
                for(rval = 1; rval < 16; rval++)
                        __put_user(cregs->u_regs[rval], (&pregs->u_regs[rval - 
1]));
                pt_succ_return(regs, 0);
-#ifdef DEBUG_PTRACE
-               printk ("PC=%x nPC=%x o7=%x\n", cregs->pc, cregs->npc, 
cregs->u_regs [15]);
-#endif
                goto out_tsk;
        }
 
@@ -801,12 +768,6 @@ asmlinkage void do_ptrace(struct pt_regs *regs)
                        clear_tsk_thread_flag(child, TIF_SYSCALL_TRACE);
 
                child->exit_code = data;
-#ifdef DEBUG_PTRACE
-               printk("CONT: %s [%d]: set exit_code = %x %lx %lx\n",
-                       child->comm, child->pid, child->exit_code,
-                       child->thread.kregs->pc,
-                       child->thread.kregs->npc);
-#endif
                wake_up_process(child);
                pt_succ_return(regs, 0);
                goto out_tsk;
@@ -858,9 +819,6 @@ out:
 
 asmlinkage void syscall_trace(void)
 {
-#ifdef DEBUG_PTRACE
-       printk("%s [%d]: syscall_trace\n", current->comm, current->pid);
-#endif
        if (!test_thread_flag(TIF_SYSCALL_TRACE))
                return;
        if (!(current->ptrace & PT_PTRACED))
@@ -873,10 +831,6 @@ asmlinkage void syscall_trace(void)
         * for normal use.  strace only continues with a signal if the
         * stopping signal is not SIGTRAP.  -brl
         */
-#ifdef DEBUG_PTRACE
-       printk("%s [%d]: syscall_trace exit= %x\n", current->comm,
-               current->pid, current->exit_code);
-#endif
        if (current->exit_code) {
                send_sig (current->exit_code, current, 1);
                current->exit_code = 0;
diff --git a/arch/sparc64/kernel/ptrace.c b/arch/sparc64/kernel/ptrace.c
index 668f569..2232e85 100644
--- a/arch/sparc64/kernel/ptrace.c
+++ b/arch/sparc64/kernel/ptrace.c
@@ -87,19 +87,6 @@ pt_os_succ_return (struct pt_regs *regs, unsigned long val, 
void __user *addr)
 }
 
 /* #define ALLOW_INIT_TRACING */
-/* #define DEBUG_PTRACE */
-
-#ifdef DEBUG_PTRACE
-char *pt_rq [] = {
-       /* 0  */ "TRACEME", "PEEKTEXT", "PEEKDATA", "PEEKUSR",
-       /* 4  */ "POKETEXT", "POKEDATA", "POKEUSR", "CONT",
-       /* 8  */ "KILL", "SINGLESTEP", "SUNATTACH", "SUNDETACH",
-       /* 12 */ "GETREGS", "SETREGS", "GETFPREGS", "SETFPREGS",
-       /* 16 */ "READDATA", "WRITEDATA", "READTEXT", "WRITETEXT",
-       /* 20 */ "GETFPAREGS", "SETFPAREGS", "unknown", "unknown",
-       /* 24 */ "SYSCALL", ""
-};
-#endif
 
 /*
  * Called by kernel/ptrace.c when detaching..
@@ -763,23 +750,6 @@ asmlinkage void do_ptrace(struct pt_regs *regs)
                addr2 &= 0xffffffffUL;
        }
        lock_kernel();
-#ifdef DEBUG_PTRACE
-       {
-               char *s;
-
-               if ((request >= 0) && (request <= 24))
-                       s = pt_rq [request];
-               else
-                       s = "unknown";
-
-               if (request == PTRACE_POKEDATA && data == 0x91d02001){
-                       printk ("do_ptrace: breakpoint pid=%d, addr=%016lx 
addr2=%016lx\n",
-                               pid, addr, addr2);
-               } else 
-                       printk("do_ptrace: rq=%s(%d) pid=%d addr=%016lx 
data=%016lx addr2=%016lx\n",
-                              s, request, pid, addr, data, addr2);
-       }
-#endif
        if (request == PTRACE_TRACEME) {
                ret = ptrace_traceme();
                if (ret < 0)
@@ -905,9 +875,6 @@ asmlinkage void do_ptrace(struct pt_regs *regs)
                                goto out_tsk;
                        }
                pt_succ_return(regs, 0);
-#ifdef DEBUG_PTRACE
-               printk ("PC=%lx nPC=%lx o7=%lx\n", cregs->tpc, cregs->tnpc, 
cregs->u_regs [15]);
-#endif
                goto out_tsk;
        }
 
@@ -932,9 +899,6 @@ asmlinkage void do_ptrace(struct pt_regs *regs)
                                goto out_tsk;
                        }
                pt_succ_return(regs, 0);
-#ifdef DEBUG_PTRACE
-               printk ("PC=%lx nPC=%lx o7=%lx\n", cregs->tpc, cregs->tnpc, 
cregs->u_regs [15]);
-#endif
                goto out_tsk;
        }
 
@@ -1152,13 +1116,6 @@ asmlinkage void do_ptrace(struct pt_regs *regs)
                }
 
                child->exit_code = data;
-#ifdef DEBUG_PTRACE
-               printk("CONT: %s [%d]: set exit_code = %x %lx %lx\n", 
child->comm,
-                       child->pid, child->exit_code,
-                       task_pt_regs(child)->tpc,
-                       task_pt_regs(child)->tnpc);
-                      
-#endif
                wake_up_process(child);
                pt_succ_return(regs, 0);
                goto out_tsk;
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to