From 9e0eaf372998845b61053ca428ea9ba40b316846 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Sun, 14 Feb 2010 22:49:59 +0000
Subject: [PATCH] --- yaml --- r: 188505 b: refs/heads/master c:
 5f09c77d2ad69397498b6555f0d3cd697304253c h: refs/heads/master i:   188503:
 f50f78220ba05efca64f271581a347aa1023cda5 v: v3

---
 [refs]                              |  2 +-
 trunk/arch/blackfin/kernel/ptrace.c | 24 ++++++------------------
 2 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/[refs] b/[refs]
index 9045d4fde64d..c9a48f02c647 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f5b99627a3065858ad5c678703ed7af5363dca39
+refs/heads/master: 5f09c77d2ad69397498b6555f0d3cd697304253c
diff --git a/trunk/arch/blackfin/kernel/ptrace.c b/trunk/arch/blackfin/kernel/ptrace.c
index 895302df21c1..14118e40f18f 100644
--- a/trunk/arch/blackfin/kernel/ptrace.c
+++ b/trunk/arch/blackfin/kernel/ptrace.c
@@ -31,12 +31,6 @@
  * in exit.c or in signal.c.
  */
 
-/* determines which bits in the SYSCFG reg the user has access to. */
-/* 1 = access 0 = no access */
-#define SYSCFG_MASK 0x0007	/* SYSCFG reg */
-/* sets the trace bits. */
-#define TRACE_BITS 0x0001
-
 /* Find the stack offset for a register, relative to thread.esp0. */
 #define PT_REG(reg)	((long)&((struct pt_regs *)0)->reg)
 
@@ -162,9 +156,8 @@ static inline int is_user_addr_valid(struct task_struct *child,
 
 void ptrace_enable(struct task_struct *child)
 {
-	unsigned long tmp;
-	tmp = get_reg(child, PT_SYSCFG) | (TRACE_BITS);
-	put_reg(child, PT_SYSCFG, tmp);
+	struct pt_regs *regs = task_pt_regs(child);
+	regs->syscfg |= SYSCFG_SSSTEP;
 }
 
 /*
@@ -174,10 +167,8 @@ void ptrace_enable(struct task_struct *child)
  */
 void ptrace_disable(struct task_struct *child)
 {
-	unsigned long tmp;
-	/* make sure the single step bit is not set. */
-	tmp = get_reg(child, PT_SYSCFG) & ~TRACE_BITS;
-	put_reg(child, PT_SYSCFG, tmp);
+	struct pt_regs *regs = task_pt_regs(child);
+	regs->syscfg &= ~SYSCFG_SSSTEP;
 }
 
 long arch_ptrace(struct task_struct *child, long request, long addr, long data)
@@ -343,14 +334,11 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
 			break;
 		}
 
-		if (addr >= (sizeof(struct pt_regs))) {
+		/* Ignore writes to SYSCFG and other pseudo regs */
+		if (addr >= PT_SYSCFG) {
 			ret = 0;
 			break;
 		}
-		if (addr == PT_SYSCFG) {
-			data &= SYSCFG_MASK;
-			data |= get_reg(child, PT_SYSCFG);
-		}
 		ret = put_reg(child, addr, data);
 		break;