[MIPS] Unify mips_fpu_soft_struct and mips_fpu_hard_structs.

The struct mips_fpu_soft_struct and mips_fpu_hard_struct are
completely same now and the kernel fpu emulator assumes that.  This
patch unifies them to mips_fpu_struct and get rid of mips_fpu_union.

Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

1 files changed, 5 insertions, 11 deletions

diff --git a/arch/mips/kernel/ptrace32.c b/arch/mips/kernel/ptrace32.c
index 8704dc0496ea..f40ecd8be05f 100644
--- a/arch/mips/kernel/ptrace32.c
+++ b/arch/mips/kernel/ptrace32.c
@@ -166,10 +166,7 @@ asmlinkage int sys32_ptrace(int request, int pid, int addr, int data)
                         tmp = regs->lo;
                         break;
                 case FPC_CSR:
-                        if (cpu_has_fpu)
-                                tmp = child->thread.fpu.hard.fcr31;
-                        else
-                                tmp = child->thread.fpu.soft.fcr31;
+                        tmp = child->thread.fpu.fcr31;
                         break;
                 case FPC_EIR: { /* implementation / version register */
                         unsigned int flags;
@@ -288,9 +285,9 @@ asmlinkage int sys32_ptrace(int request, int pid, int addr, int data)
 
                         if (!tsk_used_math(child)) {
                                 /* FP not yet used  */
-                                memset(&child->thread.fpu.hard, ~0,
-                                       sizeof(child->thread.fpu.hard));
-                                child->thread.fpu.hard.fcr31 = 0;
+                                memset(&child->thread.fpu, ~0,
+                                       sizeof(child->thread.fpu));
+                                child->thread.fpu.fcr31 = 0;
                         }
                         /*
                          * The odd registers are actually the high order bits
@@ -318,10 +315,7 @@ asmlinkage int sys32_ptrace(int request, int pid, int addr, int data)
                         regs->lo = data;
                         break;
                 case FPC_CSR:
-                        if (cpu_has_fpu)
-                                child->thread.fpu.hard.fcr31 = data;
-                        else
-                                child->thread.fpu.soft.fcr31 = data;
+                        child->thread.fpu.fcr31 = data;
                         break;
                 case DSP_BASE ... DSP_BASE + 5: {
                         dspreg_t *dregs;