1 files changed, 1 insertions, 65 deletions

diff --git a/arch/mips/include/asm/sigcontext.h b/arch/mips/include/asm/sigcontext.h
index 9e89cf99d4e4..eeeb0f48c767 100644
--- a/arch/mips/include/asm/sigcontext.h
+++ b/arch/mips/include/asm/sigcontext.h
@@ -9,71 +9,10 @@
 #ifndef _ASM_SIGCONTEXT_H
 #define _ASM_SIGCONTEXT_H
 
-#include <linux/types.h>
-#include <asm/sgidefs.h>
-
-#if _MIPS_SIM == _MIPS_SIM_ABI32
-
-/*
- * Keep this struct definition in sync with the sigcontext fragment
- * in arch/mips/tools/offset.c
- */
-struct sigcontext {
-        unsigned int            sc_regmask;     /* Unused */
-        unsigned int            sc_status;      /* Unused */
-        unsigned long long      sc_pc;
-        unsigned long long      sc_regs[32];
-        unsigned long long      sc_fpregs[32];
-        unsigned int            sc_acx;         /* Was sc_ownedfp */
-        unsigned int            sc_fpc_csr;
-        unsigned int            sc_fpc_eir;     /* Unused */
-        unsigned int            sc_used_math;
-        unsigned int            sc_dsp;         /* dsp status, was sc_ssflags */
-        unsigned long long      sc_mdhi;
-        unsigned long long      sc_mdlo;
-        unsigned long           sc_hi1;         /* Was sc_cause */
-        unsigned long           sc_lo1;         /* Was sc_badvaddr */
-        unsigned long           sc_hi2;         /* Was sc_sigset[4] */
-        unsigned long           sc_lo2;
-        unsigned long           sc_hi3;
-        unsigned long           sc_lo3;
-};
-
-#endif /* _MIPS_SIM == _MIPS_SIM_ABI32 */
+#include <uapi/asm/sigcontext.h>
 
 #if _MIPS_SIM == _MIPS_SIM_ABI64 || _MIPS_SIM == _MIPS_SIM_NABI32
 
-#include <linux/posix_types.h>
-/*
- * Keep this struct definition in sync with the sigcontext fragment
- * in arch/mips/tools/offset.c
- *
- * Warning: this structure illdefined with sc_badvaddr being just an unsigned
- * int so it was changed to unsigned long in 2.6.0-test1.  This may break
- * binary compatibility - no prisoners.
- * DSP ASE in 2.6.12-rc4.  Turn sc_mdhi and sc_mdlo into an array of four
- * entries, add sc_dsp and sc_reserved for padding.  No prisoners.
- */
-struct sigcontext {
-        __u64   sc_regs[32];
-        __u64   sc_fpregs[32];
-        __u64   sc_mdhi;
-        __u64   sc_hi1;
-        __u64   sc_hi2;
-        __u64   sc_hi3;
-        __u64   sc_mdlo;
-        __u64   sc_lo1;
-        __u64   sc_lo2;
-        __u64   sc_lo3;
-        __u64   sc_pc;
-        __u32   sc_fpc_csr;
-        __u32   sc_used_math;
-        __u32   sc_dsp;
-        __u32   sc_reserved;
-};
-
-#ifdef __KERNEL__
-
 struct sigcontext32 {
         __u32           sc_regmask;     /* Unused */
         __u32           sc_status;      /* Unused */
@@ -94,8 +33,5 @@ struct sigcontext32 {
         __u32           sc_hi3;
         __u32           sc_lo3;
 };
-#endif /* __KERNEL__ */
-
 #endif /* _MIPS_SIM == _MIPS_SIM_ABI64 || _MIPS_SIM == _MIPS_SIM_NABI32 */
-
 #endif /* _ASM_SIGCONTEXT_H */