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

Commit 872065e7 authored by Greg Ungerer's avatar Greg Ungerer
Browse files

m68k: merge the mmu and non-mmu versions of ucontext.h 



The non-mmu m68k setups can use the mm ucontext.h with no change.

Signed-off-by: default avatarGreg Ungerer <gerg@uclinux.org>
Acked-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
parent 4330e179

arch/m68k/include/asm/ucontext.h

+29 −4
Original line number Diff line number Diff line 
#ifdef __uClinux__

#include "ucontext_no.h"

#else

#include "ucontext_mm.h"

#ifndef _M68K_UCONTEXT_H

#define _M68K_UCONTEXT_H



typedef int greg_t;

#define NGREG 18

typedef greg_t gregset_t[NGREG];



typedef struct fpregset {

	int f_fpcntl[3];

	int f_fpregs[8*3];

} fpregset_t;



struct mcontext {

	int version;

	gregset_t gregs;

	fpregset_t fpregs;

};



#define MCONTEXT_VERSION 2



struct ucontext {

	unsigned long	  uc_flags;

	struct ucontext  *uc_link;

	stack_t		  uc_stack;

	struct mcontext	  uc_mcontext;

	unsigned long	  uc_filler[80];

	sigset_t	  uc_sigmask;	/* mask last for extensibility */

};



#endif

arch/m68k/include/asm/ucontext_mm.h

deleted100644 → 0
+0 −30
Original line number Diff line number Diff line 
#ifndef _M68K_UCONTEXT_H

#define _M68K_UCONTEXT_H



typedef int greg_t;

#define NGREG 18

typedef greg_t gregset_t[NGREG];



typedef struct fpregset {

	int f_fpcntl[3];

	int f_fpregs[8*3];

} fpregset_t;



struct mcontext {

	int version;

	gregset_t gregs;

	fpregset_t fpregs;

};



#define MCONTEXT_VERSION 2



struct ucontext {

	unsigned long	  uc_flags;

	struct ucontext  *uc_link;

	stack_t		  uc_stack;

	struct mcontext	  uc_mcontext;

	unsigned long	  uc_filler[80];

	sigset_t	  uc_sigmask;	/* mask last for extensibility */

};



#endif

arch/m68k/include/asm/ucontext_no.h

deleted100644 → 0
+0 −32
Original line number Diff line number Diff line 
#ifndef _M68KNOMMU_UCONTEXT_H

#define _M68KNOMMU_UCONTEXT_H



typedef int greg_t;

#define NGREG 18

typedef greg_t gregset_t[NGREG];



typedef struct fpregset {

	int f_pcr;

	int f_psr;

	int f_fpiaddr;

	int f_fpregs[8][3];

} fpregset_t;



struct mcontext {

	int version;

	gregset_t gregs;

	fpregset_t fpregs;

};



#define MCONTEXT_VERSION 2



struct ucontext {

	unsigned long	  uc_flags;

	struct ucontext  *uc_link;

	stack_t		  uc_stack;

	struct mcontext	  uc_mcontext;

	unsigned long	  uc_filler[80];

	sigset_t	  uc_sigmask;	/* mask last for extensibility */

};



#endif