From 656874419b73e120262cb763b9139e2945f6b5c9 Mon Sep 17 00:00:00 2001
From: Roland McGrath <roland@redhat.com>
Date: Wed, 30 Jan 2008 13:31:47 +0100
Subject: [PATCH] --- yaml --- r: 80059 b: refs/heads/master c:
 16c3e389e7a7254ff8dc7029ac4fbe996c3c75bf h: refs/heads/master i:   80057:
 74f94f7ac6cfa2e4f94aad518126174cefafd7c6   80055:
 8b2b27a113f23f07d74046ce9a17323a93be90e0 v: v3

---
 [refs]                | 2 +-
 trunk/kernel/ptrace.c | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 404d65cc06e2..8ba49647b8c9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5bde4d181793be84351bc21c256d8c71cfcd313a
+refs/heads/master: 16c3e389e7a7254ff8dc7029ac4fbe996c3c75bf
diff --git a/trunk/kernel/ptrace.c b/trunk/kernel/ptrace.c
index 973d727f5e84..e6a99d2793b3 100644
--- a/trunk/kernel/ptrace.c
+++ b/trunk/kernel/ptrace.c
@@ -426,6 +426,13 @@ int ptrace_request(struct task_struct *child, long request,
 	int ret = -EIO;
 
 	switch (request) {
+	case PTRACE_PEEKTEXT:
+	case PTRACE_PEEKDATA:
+		return generic_ptrace_peekdata(child, addr, data);
+	case PTRACE_POKETEXT:
+	case PTRACE_POKEDATA:
+		return generic_ptrace_pokedata(child, addr, data);
+
 #ifdef PTRACE_OLDSETOPTIONS
 	case PTRACE_OLDSETOPTIONS:
 #endif