Commit 5adb83c2fa136e14172b1a65b0f8aa28f2cb9f62
1 parent
608f8b3cf3
Exists in
master
and in
7 other branches
powerpc: merge ucontext.h
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Showing 3 changed files with 40 additions and 49 deletions Side-by-side Diff
include/asm-powerpc/ucontext.h
| 1 | +#ifndef _ASM_POWERPC_UCONTEXT_H | |
| 2 | +#define _ASM_POWERPC_UCONTEXT_H | |
| 3 | + | |
| 4 | +#ifdef __powerpc64__ | |
| 5 | +#include <asm/sigcontext.h> | |
| 6 | +#else | |
| 7 | +#include <asm/elf.h> | |
| 8 | +#endif | |
| 9 | +#include <asm/signal.h> | |
| 10 | + | |
| 11 | +#ifndef __powerpc64__ | |
| 12 | +struct mcontext { | |
| 13 | + elf_gregset_t mc_gregs; | |
| 14 | + elf_fpregset_t mc_fregs; | |
| 15 | + unsigned long mc_pad[2]; | |
| 16 | + elf_vrregset_t mc_vregs __attribute__((__aligned__(16))); | |
| 17 | +}; | |
| 18 | +#endif | |
| 19 | + | |
| 20 | +struct ucontext { | |
| 21 | + unsigned long uc_flags; | |
| 22 | + struct ucontext __user *uc_link; | |
| 23 | + stack_t uc_stack; | |
| 24 | +#ifndef __powerpc64__ | |
| 25 | + int uc_pad[7]; | |
| 26 | + struct mcontext __user *uc_regs;/* points to uc_mcontext field */ | |
| 27 | +#endif | |
| 28 | + sigset_t uc_sigmask; | |
| 29 | + /* glibc has 1024-bit signal masks, ours are 64-bit */ | |
| 30 | +#ifdef __powerpc64__ | |
| 31 | + sigset_t __unused[15]; /* Allow for uc_sigmask growth */ | |
| 32 | + struct sigcontext uc_mcontext; /* last for extensibility */ | |
| 33 | +#else | |
| 34 | + int uc_maskext[30]; | |
| 35 | + int uc_pad2[3]; | |
| 36 | + struct mcontext uc_mcontext; | |
| 37 | +#endif | |
| 38 | +}; | |
| 39 | + | |
| 40 | +#endif /* _ASM_POWERPC_UCONTEXT_H */ |
include/asm-ppc/ucontext.h
| 1 | -#ifndef _ASMPPC_UCONTEXT_H | |
| 2 | -#define _ASMPPC_UCONTEXT_H | |
| 3 | - | |
| 4 | -#include <asm/elf.h> | |
| 5 | -#include <asm/signal.h> | |
| 6 | - | |
| 7 | -struct mcontext { | |
| 8 | - elf_gregset_t mc_gregs; | |
| 9 | - elf_fpregset_t mc_fregs; | |
| 10 | - unsigned long mc_pad[2]; | |
| 11 | - elf_vrregset_t mc_vregs __attribute__((__aligned__(16))); | |
| 12 | -}; | |
| 13 | - | |
| 14 | -struct ucontext { | |
| 15 | - unsigned long uc_flags; | |
| 16 | - struct ucontext __user *uc_link; | |
| 17 | - stack_t uc_stack; | |
| 18 | - int uc_pad[7]; | |
| 19 | - struct mcontext __user *uc_regs;/* points to uc_mcontext field */ | |
| 20 | - sigset_t uc_sigmask; | |
| 21 | - /* glibc has 1024-bit signal masks, ours are 64-bit */ | |
| 22 | - int uc_maskext[30]; | |
| 23 | - int uc_pad2[3]; | |
| 24 | - struct mcontext uc_mcontext; | |
| 25 | -}; | |
| 26 | - | |
| 27 | -#endif /* !_ASMPPC_UCONTEXT_H */ |
include/asm-ppc64/ucontext.h
| 1 | -#ifndef _ASMPPC64_UCONTEXT_H | |
| 2 | -#define _ASMPPC64_UCONTEXT_H | |
| 3 | - | |
| 4 | -#include <asm/sigcontext.h> | |
| 5 | - | |
| 6 | -/* | |
| 7 | - * This program is free software; you can redistribute it and/or | |
| 8 | - * modify it under the terms of the GNU General Public License | |
| 9 | - * as published by the Free Software Foundation; either version | |
| 10 | - * 2 of the License, or (at your option) any later version. | |
| 11 | - */ | |
| 12 | - | |
| 13 | -struct ucontext { | |
| 14 | - unsigned long uc_flags; | |
| 15 | - struct ucontext *uc_link; | |
| 16 | - stack_t uc_stack; | |
| 17 | - sigset_t uc_sigmask; | |
| 18 | - sigset_t __unsued[15]; /* Allow for uc_sigmask growth */ | |
| 19 | - struct sigcontext uc_mcontext; /* last for extensibility */ | |
| 20 | -}; | |
| 21 | - | |
| 22 | -#endif /* _ASMPPC64_UCONTEXT_H */ |