diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-19 17:38:33 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-19 17:38:33 -0800 |
| commit | 1ca949299260aa49eeba34ff912e2321c8b1f647 (patch) | |
| tree | bb23ca6055b30a43c6c6c51c869c66f23180bb48 /include/asm-mips/sigcontext.h | |
| parent | c9ce228306fda4448f5f495b4f36c07956f45acd (diff) | |
| parent | 0cfd5267476ce8051c4447988d2b0377d09188e8 (diff) | |
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
[MIPS] Cobalt: Fix UART I/O type
[MIPS] Fixup copy_from_user_inatomic
[MIPS] Fix struct sigcontext for N32 userland
[MIPS] Make some __setup functions static
[MIPS] Declare highstart_pfn, highend_pfn only if CONFIG_HIGHMEM=y
[MIPS] Allow selection of KGDB only on platforms where it's supported.
Diffstat (limited to 'include/asm-mips/sigcontext.h')
| -rw-r--r-- | include/asm-mips/sigcontext.h | 33 |
1 files changed, 16 insertions, 17 deletions
diff --git a/include/asm-mips/sigcontext.h b/include/asm-mips/sigcontext.h index 3c175a7e434..972947474eb 100644 --- a/include/asm-mips/sigcontext.h +++ b/include/asm-mips/sigcontext.h @@ -42,6 +42,7 @@ struct sigcontext { #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 @@ -53,27 +54,25 @@ struct sigcontext { * entries, add sc_dsp and sc_reserved for padding. No prisoners. */ struct sigcontext { - unsigned long sc_regs[32]; - unsigned long sc_fpregs[32]; - unsigned long sc_mdhi; - unsigned long sc_hi1; - unsigned long sc_hi2; - unsigned long sc_hi3; - unsigned long sc_mdlo; - unsigned long sc_lo1; - unsigned long sc_lo2; - unsigned long sc_lo3; - unsigned long sc_pc; - unsigned int sc_fpc_csr; - unsigned int sc_used_math; - unsigned int sc_dsp; - unsigned int sc_reserved; + __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__ -#include <linux/posix_types.h> - struct sigcontext32 { __u32 sc_regmask; /* Unused */ __u32 sc_status; /* Unused */ |