mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-26 10:49:33 +00:00
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: Greg Ungerer <gerg@uclinux.org> Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
This commit is contained in:
parent
4330e179a9
commit
872065e78c
3 changed files with 29 additions and 66 deletions
|
@ -1,5 +1,30 @@
|
|||
#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
|
||||
|
|
|
@ -1,30 +0,0 @@
|
|||
#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
|
|
@ -1,32 +0,0 @@
|
|||
#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
|
Loading…
Reference in a new issue