[PATCH] m68knommu: remove FP conditionals in ucontext struct

The first patch is to the 2.6 kernel include file (for m68knommu), to get
rid of the conditional definitions, otherwise the structures have different
sizes depending on whether there's an FPU or not.

Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Gavin Lambert 2006-12-06 11:57:53 +10:00 committed by Linus Torvalds
parent a8b8d57c25
commit 3363c9b0ed

View File

@ -5,21 +5,17 @@ typedef int greg_t;
#define NGREG 18
typedef greg_t gregset_t[NGREG];
#ifdef CONFIG_FPU
typedef struct fpregset {
int f_pcr;
int f_psr;
int f_fpiaddr;
int f_fpregs[8][3];
} fpregset_t;
#endif
struct mcontext {
int version;
gregset_t gregs;
#ifdef CONFIG_FPU
fpregset_t fpregs;
#endif
};
#define MCONTEXT_VERSION 2
@ -29,9 +25,7 @@ struct ucontext {
struct ucontext *uc_link;
stack_t uc_stack;
struct mcontext uc_mcontext;
#ifdef CONFIG_FPU
unsigned long uc_filler[80];
#endif
sigset_t uc_sigmask; /* mask last for extensibility */
};