From 96545fb4e525853abc714815755a8e853b87502f Mon Sep 17 00:00:00 2001
From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Sat, 6 Feb 2010 10:35:23 +0000
Subject: [PATCH] --- yaml --- r: 183020 b: refs/heads/master c:
 462f39a8c7496c95f4de91ef46d875f46e0fa271 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 9d9268a4ba45..799c3c232429 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d23bc1b3a7e6db935acb9a949a5985d9b77dfd13
+refs/heads/master: 462f39a8c7496c95f4de91ef46d875f46e0fa271
diff --git a/trunk/arch/arm/kernel/ptrace.c b/trunk/arch/arm/kernel/ptrace.c
index bd56673c6a69..bdf002bab6a5 100644
--- a/trunk/arch/arm/kernel/ptrace.c
+++ b/trunk/arch/arm/kernel/ptrace.c
@@ -743,26 +743,10 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
 	int ret;
 
 	switch (request) {
-		/*
-		 * read word at location "addr" in the child process.
-		 */
-		case PTRACE_PEEKTEXT:
-		case PTRACE_PEEKDATA:
-			ret = generic_ptrace_peekdata(child, addr, data);
-			break;
-
 		case PTRACE_PEEKUSR:
 			ret = ptrace_read_user(child, addr, (unsigned long __user *)data);
 			break;
 
-		/*
-		 * write the word at location addr.
-		 */
-		case PTRACE_POKETEXT:
-		case PTRACE_POKEDATA:
-			ret = generic_ptrace_pokedata(child, addr, data);
-			break;
-
 		case PTRACE_POKEUSR:
 			ret = ptrace_write_user(child, addr, data);
 			break;