Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3363c9b0 authored by Gavin Lambert's avatar Gavin Lambert Committed by Linus Torvalds
Browse files

[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: default avatarGreg Ungerer <gerg@uclinux.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent a8b8d57c

include/asm-m68knommu/ucontext.h

+0 −6
Original line number Diff line number Diff line
@@ -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 */

};