Revert "MIPS: Save/restore MSA context around signals"

[linux-beck.git] / arch / mips / kernel / asm-offsets.c

diff --git a/arch/mips/kernel/asm-offsets.c b/arch/mips/kernel/asm-offsets.c
index 0ea75c244b487848c36c168b4f2f9c7dad4822a5..4bb5107511e2de9a74e22a947bc2b88eceb71732 100644 (file)
--- a/arch/mips/kernel/asm-offsets.c
+++ b/arch/mips/kernel/asm-offsets.c
@@ -14,6 +14,7 @@
 #include <linux/mm.h>
 #include <linux/kbuild.h>
 #include <linux/suspend.h>
+#include <asm/pm.h>
 #include <asm/ptrace.h>
 #include <asm/processor.h>
 #include <asm/smp-cps.h>
@@ -64,9 +65,6 @@ void output_ptreg_defines(void)
        OFFSET(PT_BVADDR, pt_regs, cp0_badvaddr);
        OFFSET(PT_STATUS, pt_regs, cp0_status);
        OFFSET(PT_CAUSE, pt_regs, cp0_cause);
-#ifdef CONFIG_MIPS_MT_SMTC
-       OFFSET(PT_TCSTATUS, pt_regs, cp0_tcstatus);
-#endif /* CONFIG_MIPS_MT_SMTC */
 #ifdef CONFIG_CPU_CAVIUM_OCTEON
        OFFSET(PT_MPL, pt_regs, mpl);
        OFFSET(PT_MTP, pt_regs, mtp);
@@ -295,7 +293,6 @@ void output_sc_defines(void)
        OFFSET(SC_LO2, sigcontext, sc_lo2);
        OFFSET(SC_HI3, sigcontext, sc_hi3);
        OFFSET(SC_LO3, sigcontext, sc_lo3);
-       OFFSET(SC_MSAREGS, sigcontext, sc_msaregs);
        BLANK();
 }
 #endif
@@ -310,7 +307,6 @@ void output_sc_defines(void)
        OFFSET(SC_MDLO, sigcontext, sc_mdlo);
        OFFSET(SC_PC, sigcontext, sc_pc);
        OFFSET(SC_FPC_CSR, sigcontext, sc_fpc_csr);
-       OFFSET(SC_MSAREGS, sigcontext, sc_msaregs);
        BLANK();
 }
 #endif
@@ -322,7 +318,6 @@ void output_sc32_defines(void)
        OFFSET(SC32_FPREGS, sigcontext32, sc_fpregs);
        OFFSET(SC32_FPC_CSR, sigcontext32, sc_fpc_csr);
        OFFSET(SC32_FPC_EIR, sigcontext32, sc_fpc_eir);
-       OFFSET(SC32_MSAREGS, sigcontext32, sc_msaregs);
        BLANK();
 }
 #endif
@@ -404,6 +399,20 @@ void output_pbe_defines(void)
 }
 #endif
 
+#ifdef CONFIG_CPU_PM
+void output_pm_defines(void)
+{
+       COMMENT(" PM offsets. ");
+#ifdef CONFIG_EVA
+       OFFSET(SSS_SEGCTL0,     mips_static_suspend_state, segctl[0]);
+       OFFSET(SSS_SEGCTL1,     mips_static_suspend_state, segctl[1]);
+       OFFSET(SSS_SEGCTL2,     mips_static_suspend_state, segctl[2]);
+#endif
+       OFFSET(SSS_SP,          mips_static_suspend_state, sp);
+       BLANK();
+}
+#endif
+
 void output_kvm_defines(void)
 {
        COMMENT(" KVM/MIPS Specfic offsets. ");
@@ -472,10 +481,14 @@ void output_kvm_defines(void)
 void output_cps_defines(void)
 {
        COMMENT(" MIPS CPS offsets. ");
-       OFFSET(BOOTCFG_CORE, boot_config, core);
-       OFFSET(BOOTCFG_VPE, boot_config, vpe);
-       OFFSET(BOOTCFG_PC, boot_config, pc);
-       OFFSET(BOOTCFG_SP, boot_config, sp);
-       OFFSET(BOOTCFG_GP, boot_config, gp);
+
+       OFFSET(COREBOOTCFG_VPEMASK, core_boot_config, vpe_mask);
+       OFFSET(COREBOOTCFG_VPECONFIG, core_boot_config, vpe_config);
+       DEFINE(COREBOOTCFG_SIZE, sizeof(struct core_boot_config));
+
+       OFFSET(VPEBOOTCFG_PC, vpe_boot_config, pc);
+       OFFSET(VPEBOOTCFG_SP, vpe_boot_config, sp);
+       OFFSET(VPEBOOTCFG_GP, vpe_boot_config, gp);
+       DEFINE(VPEBOOTCFG_SIZE, sizeof(struct vpe_boot_config));
 }
 #endif