diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /arch/m68k/include/asm/sigcontext.h | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'arch/m68k/include/asm/sigcontext.h')
| -rw-r--r-- | arch/m68k/include/asm/sigcontext.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/m68k/include/asm/sigcontext.h b/arch/m68k/include/asm/sigcontext.h index 523db2a51cf3..a29dd74a17cb 100644 --- a/arch/m68k/include/asm/sigcontext.h +++ b/arch/m68k/include/asm/sigcontext.h | |||
| @@ -15,7 +15,11 @@ struct sigcontext { | |||
| 15 | unsigned long sc_pc; | 15 | unsigned long sc_pc; |
| 16 | unsigned short sc_formatvec; | 16 | unsigned short sc_formatvec; |
| 17 | #ifndef __uClinux__ | 17 | #ifndef __uClinux__ |
| 18 | # ifdef __mcoldfire__ | ||
| 19 | unsigned long sc_fpregs[2][2]; /* room for two fp registers */ | ||
| 20 | # else | ||
| 18 | unsigned long sc_fpregs[2*3]; /* room for two fp registers */ | 21 | unsigned long sc_fpregs[2*3]; /* room for two fp registers */ |
| 22 | # endif | ||
| 19 | unsigned long sc_fpcntl[3]; | 23 | unsigned long sc_fpcntl[3]; |
| 20 | unsigned char sc_fpstate[216]; | 24 | unsigned char sc_fpstate[216]; |
| 21 | #endif | 25 | #endif |