From 74386212a5cfa4822598ea9850949ab7c145d951 Mon Sep 17 00:00:00 2001
From: Christoph Hellwig <hch@lst.de>
Date: Thu, 1 May 2008 18:43:12 +0200
Subject: [PATCH] --- yaml --- r: 95730 b: refs/heads/master c:
 bcf35afb528109a31264b45d4851fa6ae72dbe18 h: refs/heads/master v: v3

---
 [refs]                | 2 +-
 trunk/kernel/ptrace.c | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 250f667fd4d6..fbc4ff3d70fe 100644
--- 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
index dcc199c43a12..6c19e94fd0a5 100644
--- 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)
 {