---

yaml --- r: 95730 b: refs/heads/master c: bcf35af h: refs/heads/master v: v3
git-mirror · May 1, 2008 · 7438621 · 7438621
1 parent bae8ce6
commit 7438621
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9fc3ace937a675bf42cbe6e6ef8950a6731ca16f
+refs/heads/master: bcf35afb528109a31264b45d4851fa6ae72dbe18
diff --git a/trunk/kernel/ptrace.c b/trunk/kernel/ptrace.c
@@ -534,7 +534,6 @@ struct task_struct *ptrace_get_task_struct(pid_t pid)
 #define arch_ptrace_attach(child)	do { } while (0)
 #endif
 
-#ifndef __ARCH_SYS_PTRACE
 asmlinkage long sys_ptrace(long request, long pid, long addr, long data)
 {
 	struct task_struct *child;
@@ -582,7 +581,6 @@ asmlinkage long sys_ptrace(long request, long pid, long addr, long data)
 	unlock_kernel();
 	return ret;
 }
-#endif /* __ARCH_SYS_PTRACE */
 
 int generic_ptrace_peekdata(struct task_struct *tsk, long addr, long data)
 {