diff options
| author | Al Viro <viro@ftp.linux.org.uk> | 2011-08-18 20:04:09 +0100 |
|---|---|---|
| committer | Richard Weinberger <richard@nod.at> | 2011-11-02 14:14:54 +0100 |
| commit | 9b25fcbdc64369f4cce41e73fc0f57f3fd367d20 (patch) | |
| tree | 6248094684197d5c4f5dadf152cfcd4d4f712276 /arch/um/sys-x86/shared/sysdep | |
| parent | adcfb9852d8f2ddba908da0d023c280e23a40452 (diff) | |
um: switch stub_segv_handler to SA_SIGINFO variant, get rid of magic crap in there
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Richard Weinberger <richard@nod.at>
Diffstat (limited to 'arch/um/sys-x86/shared/sysdep')
| -rw-r--r-- | arch/um/sys-x86/shared/sysdep/stub.h | 9 | ||||
| -rw-r--r-- | arch/um/sys-x86/shared/sysdep/stub_32.h | 7 | ||||
| -rw-r--r-- | arch/um/sys-x86/shared/sysdep/stub_64.h | 7 |
3 files changed, 9 insertions, 14 deletions
diff --git a/arch/um/sys-x86/shared/sysdep/stub.h b/arch/um/sys-x86/shared/sysdep/stub.h index 13f523a3fcf..bd161e30010 100644 --- a/arch/um/sys-x86/shared/sysdep/stub.h +++ b/arch/um/sys-x86/shared/sysdep/stub.h @@ -1,5 +1,14 @@ +#include <asm/unistd.h> +#include <sys/mman.h> +#include <signal.h> +#include "as-layout.h" +#include "stub-data.h" + #ifdef __i386__ #include "stub_32.h" #else #include "stub_64.h" #endif + +extern void stub_segv_handler(int, siginfo_t *, void *); +extern void stub_clone_handler(void); diff --git a/arch/um/sys-x86/shared/sysdep/stub_32.h b/arch/um/sys-x86/shared/sysdep/stub_32.h index cca14d4ddf5..51fd256c75f 100644 --- a/arch/um/sys-x86/shared/sysdep/stub_32.h +++ b/arch/um/sys-x86/shared/sysdep/stub_32.h @@ -6,14 +6,7 @@ #ifndef __SYSDEP_STUB_H #define __SYSDEP_STUB_H -#include <sys/mman.h> #include <asm/ptrace.h> -#include <asm/unistd.h> -#include "as-layout.h" -#include "stub-data.h" - -extern void stub_segv_handler(int sig); -extern void stub_clone_handler(void); #define STUB_SYSCALL_RET EAX #define STUB_MMAP_NR __NR_mmap2 diff --git a/arch/um/sys-x86/shared/sysdep/stub_64.h b/arch/um/sys-x86/shared/sysdep/stub_64.h index 922a5702c8d..994df93c5ed 100644 --- a/arch/um/sys-x86/shared/sysdep/stub_64.h +++ b/arch/um/sys-x86/shared/sysdep/stub_64.h @@ -6,14 +6,7 @@ #ifndef __SYSDEP_STUB_H #define __SYSDEP_STUB_H -#include <sys/mman.h> -#include <asm/unistd.h> #include <sysdep/ptrace_user.h> -#include "as-layout.h" -#include "stub-data.h" - -extern void stub_segv_handler(int sig); -extern void stub_clone_handler(void); #define STUB_SYSCALL_RET PT_INDEX(RAX) #define STUB_MMAP_NR __NR_mmap |