diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2014-08-02 00:07:03 +0200 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2014-08-02 00:07:03 +0200 |
| commit | 475d5928b79bb78326a645863d46ff95c5e25e5a (patch) | |
| tree | a260aed0d94bda824d7f2c5d74b2b1f8002634aa /arch/mips/kernel/ptrace.c | |
| parent | c6b7b9f290c0987194b966d5ea1383e10e1a01b1 (diff) | |
| parent | 1062080a7d8dbe08cefce728341285e77930ef49 (diff) | |
| download | blackbird-op-linux-475d5928b79bb78326a645863d46ff95c5e25e5a.tar.gz blackbird-op-linux-475d5928b79bb78326a645863d46ff95c5e25e5a.zip | |
Merge branch '3.16-fixes' into mips-for-linux-next
Diffstat (limited to 'arch/mips/kernel/ptrace.c')
| -rw-r--r-- | arch/mips/kernel/ptrace.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/mips/kernel/ptrace.c b/arch/mips/kernel/ptrace.c index 8c78f01dbe73..645b3c4fcfba 100644 --- a/arch/mips/kernel/ptrace.c +++ b/arch/mips/kernel/ptrace.c @@ -150,6 +150,7 @@ int ptrace_setfpregs(struct task_struct *child, __u32 __user *data) } __get_user(child->thread.fpu.fcr31, data + 64); + child->thread.fpu.fcr31 &= ~FPU_CSR_ALL_X; /* FIR may not be written. */ @@ -695,7 +696,7 @@ long arch_ptrace(struct task_struct *child, long request, break; #endif case FPC_CSR: - child->thread.fpu.fcr31 = data; + child->thread.fpu.fcr31 = data & ~FPU_CSR_ALL_X; break; case DSP_BASE ... DSP_BASE + 5: { dspreg_t *dregs; |
