From de0ba9fba83fd7cd3d6b9a8376fa4cbf44da45de Mon Sep 17 00:00:00 2001
From: Ralf Baechle <ralf@linux-mips.org>
Date: Mon, 5 Dec 2005 13:47:25 +0000
Subject: [PATCH] --- yaml --- r: 17757 b: refs/heads/master c:
 6c35585273b26a580b2e2ad3d6a7db282308eec5 h: refs/heads/master i:   17755:
 ae362ace2ded3944d9136dc0920df814f07c4aa1 v: v3

---
 [refs]                             | 2 +-
 trunk/arch/mips/kernel/ptrace.c    | 8 ++------
 trunk/arch/mips/kernel/ptrace32.c  | 8 ++------
 trunk/include/asm-mips/processor.h | 1 -
 4 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/[refs] b/[refs]
index 37bcb2d756d8..4202e37bfcfb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: da2c9ed55b0c7e8107f23530bde293239a0b5091
+refs/heads/master: 6c35585273b26a580b2e2ad3d6a7db282308eec5
diff --git a/trunk/arch/mips/kernel/ptrace.c b/trunk/arch/mips/kernel/ptrace.c
index 510da5fda567..8d2549335304 100644
--- a/trunk/arch/mips/kernel/ptrace.c
+++ b/trunk/arch/mips/kernel/ptrace.c
@@ -280,12 +280,8 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
 				ret = -EIO;
 				goto out;
 			}
-			if (child->thread.dsp.used_dsp) {
-				dregs = __get_dsp_regs(child);
-				tmp = (unsigned long) (dregs[addr - DSP_BASE]);
-			} else {
-				tmp = -1;	/* DSP registers yet used  */
-			}
+			dregs = __get_dsp_regs(child);
+			tmp = (unsigned long) (dregs[addr - DSP_BASE]);
 			break;
 		}
 		case DSP_CONTROL:
diff --git a/trunk/arch/mips/kernel/ptrace32.c b/trunk/arch/mips/kernel/ptrace32.c
index 7e55457a491f..1f998bfde165 100644
--- a/trunk/arch/mips/kernel/ptrace32.c
+++ b/trunk/arch/mips/kernel/ptrace32.c
@@ -201,12 +201,8 @@ asmlinkage int sys32_ptrace(int request, int pid, int addr, int data)
 				ret = -EIO;
 				goto out_tsk;
 			}
-			if (child->thread.dsp.used_dsp) {
-				dspreg_t *dregs = __get_dsp_regs(child);
-				tmp = (unsigned long) (dregs[addr - DSP_BASE]);
-			} else {
-				tmp = -1;	/* DSP registers yet used  */
-			}
+			dspreg_t *dregs = __get_dsp_regs(child);
+			tmp = (unsigned long) (dregs[addr - DSP_BASE]);
 			break;
 		case DSP_CONTROL:
 			if (!cpu_has_dsp) {
diff --git a/trunk/include/asm-mips/processor.h b/trunk/include/asm-mips/processor.h
index f1980c6c3bcc..de53055a62ae 100644
--- a/trunk/include/asm-mips/processor.h
+++ b/trunk/include/asm-mips/processor.h
@@ -103,7 +103,6 @@ typedef __u32 dspreg_t;
 struct mips_dsp_state {
 	dspreg_t        dspr[NUM_DSP_REGS];
 	unsigned int    dspcontrol;
-	unsigned short	used_dsp;
 };
 
 #define INIT_DSP {{0,},}