1 files changed, 52 insertions, 4 deletions

diff --git a/arch/mips/kernel/signal-common.h b/arch/mips/kernel/signal-common.h
index f9234df53253..3208ff528cd2 100644
--- a/arch/mips/kernel/signal-common.h
+++ b/arch/mips/kernel/signal-common.h
@@ -8,13 +8,14 @@
  * Copyright (C) 1999, 2000 Silicon Graphics, Inc.
  */
 
+#include <linux/config.h>
+
 static inline int
 setup_sigcontext(struct pt_regs *regs, struct sigcontext *sc)
 {
         int err = 0;
 
         err |= __put_user(regs->cp0_epc, &sc->sc_pc);
-        err |= __put_user(regs->cp0_status, &sc->sc_status);
 
 #define save_gp_reg(i) do {                                             \
         err |= __put_user(regs->regs[i], &sc->sc_regs[i]);              \
@@ -30,10 +31,32 @@ setup_sigcontext(struct pt_regs *regs, struct sigcontext *sc)
         save_gp_reg(31);
 #undef save_gp_reg
 
+#ifdef CONFIG_32BIT
         err |= __put_user(regs->hi, &sc->sc_mdhi);
         err |= __put_user(regs->lo, &sc->sc_mdlo);
-        err |= __put_user(regs->cp0_cause, &sc->sc_cause);
-        err |= __put_user(regs->cp0_badvaddr, &sc->sc_badvaddr);
+        if (cpu_has_dsp) {
+                err |= __put_user(mfhi1(), &sc->sc_hi1);
+                err |= __put_user(mflo1(), &sc->sc_lo1);
+                err |= __put_user(mfhi2(), &sc->sc_hi2);
+                err |= __put_user(mflo2(), &sc->sc_lo2);
+                err |= __put_user(mfhi3(), &sc->sc_hi3);
+                err |= __put_user(mflo3(), &sc->sc_lo3);
+                err |= __put_user(rddsp(DSP_MASK), &sc->sc_dsp);
+        }
+#endif
+#ifdef CONFIG_64BIT
+        err |= __put_user(regs->hi, &sc->sc_hi[0]);
+        err |= __put_user(regs->lo, &sc->sc_lo[0]);
+        if (cpu_has_dsp) {
+                err |= __put_user(mfhi1(), &sc->sc_hi[1]);
+                err |= __put_user(mflo1(), &sc->sc_lo[1]);
+                err |= __put_user(mfhi2(), &sc->sc_hi[2]);
+                err |= __put_user(mflo2(), &sc->sc_lo[2]);
+                err |= __put_user(mfhi3(), &sc->sc_hi[3]);
+                err |= __put_user(mflo3(), &sc->sc_lo[3]);
+                err |= __put_user(rddsp(DSP_MASK), &sc->sc_dsp);
+        }
+#endif
 
         err |= __put_user(!!used_math(), &sc->sc_used_math);
 
@@ -61,15 +84,40 @@ out:
 static inline int
 restore_sigcontext(struct pt_regs *regs, struct sigcontext *sc)
 {
-        int err = 0;
         unsigned int used_math;
+        unsigned long treg;
+        int err = 0;
 
         /* Always make any pending restarted system calls return -EINTR */
         current_thread_info()->restart_block.fn = do_no_restart_syscall;
 
         err |= __get_user(regs->cp0_epc, &sc->sc_pc);
+#ifdef CONFIG_32BIT
         err |= __get_user(regs->hi, &sc->sc_mdhi);
         err |= __get_user(regs->lo, &sc->sc_mdlo);
+        if (cpu_has_dsp) {
+                err |= __get_user(treg, &sc->sc_hi1); mthi1(treg);
+                err |= __get_user(treg, &sc->sc_lo1); mtlo1(treg);
+                err |= __get_user(treg, &sc->sc_hi2); mthi2(treg);
+                err |= __get_user(treg, &sc->sc_lo2); mtlo2(treg);
+                err |= __get_user(treg, &sc->sc_hi3); mthi3(treg);
+                err |= __get_user(treg, &sc->sc_lo3); mtlo3(treg);
+                err |= __get_user(treg, &sc->sc_dsp); wrdsp(treg, DSP_MASK);
+        }
+#endif
+#ifdef CONFIG_64BIT
+        err |= __get_user(regs->hi, &sc->sc_hi[0]);
+        err |= __get_user(regs->lo, &sc->sc_lo[0]);
+        if (cpu_has_dsp) {
+                err |= __get_user(treg, &sc->sc_hi[1]); mthi1(treg);
+                err |= __get_user(treg, &sc->sc_lo[1]); mthi1(treg);
+                err |= __get_user(treg, &sc->sc_hi[2]); mthi2(treg);
+                err |= __get_user(treg, &sc->sc_lo[2]); mthi2(treg);
+                err |= __get_user(treg, &sc->sc_hi[3]); mthi3(treg);
+                err |= __get_user(treg, &sc->sc_lo[3]); mthi3(treg);
+                err |= __get_user(treg, &sc->sc_dsp); wrdsp(treg, DSP_MASK);
+        }
+#endif
 
 #define restore_gp_reg(i) do {                                          \
         err |= __get_user(regs->regs[i], &sc->sc_regs[i]);              \