From 7eb122555c8583e1601b7a620c5a88c1e06c3eac Mon Sep 17 00:00:00 2001 From: Al Viro Date: Thu, 18 Aug 2011 20:03:39 +0100 Subject: [PATCH] um: merge hard_handler() instances, switch to use of SA_SIGINFO Signed-off-by: Al Viro Signed-off-by: Richard Weinberger --- arch/um/os-Linux/signal.c | 12 ++++++++---- arch/um/os-Linux/sys-i386/Makefile | 2 +- arch/um/os-Linux/sys-i386/signal.c | 13 ------------- arch/um/os-Linux/sys-x86_64/Makefile | 2 +- arch/um/os-Linux/sys-x86_64/signal.c | 16 ---------------- 5 files changed, 10 insertions(+), 35 deletions(-) delete mode 100644 arch/um/os-Linux/sys-i386/signal.c delete mode 100644 arch/um/os-Linux/sys-x86_64/signal.c diff --git a/arch/um/os-Linux/signal.c b/arch/um/os-Linux/signal.c index 4fc3cd19ec69..2dde9f6d6c0f 100644 --- a/arch/um/os-Linux/signal.c +++ b/arch/um/os-Linux/signal.c @@ -127,7 +127,7 @@ void set_sigstack(void *sig_stack, int size) static void (*handlers[_NSIG])(int sig, struct sigcontext *sc); -void handle_signal(int sig, struct sigcontext *sc) +static void handle_signal(int sig, struct sigcontext *sc) { unsigned long pending = 1UL << sig; @@ -168,7 +168,11 @@ void handle_signal(int sig, struct sigcontext *sc) } while (pending); } -extern void hard_handler(int sig); +static void hard_handler(int sig, siginfo_t *info, void *p) +{ + struct ucontext *uc = p; + handle_signal(sig, (struct sigcontext *) &uc->uc_mcontext); +} void set_handler(int sig, void (*handler)(int), int flags, ...) { @@ -178,7 +182,7 @@ void set_handler(int sig, void (*handler)(int), int flags, ...) int mask; handlers[sig] = (void (*)(int, struct sigcontext *)) handler; - action.sa_handler = hard_handler; + action.sa_sigaction = hard_handler; sigemptyset(&action.sa_mask); @@ -190,7 +194,7 @@ void set_handler(int sig, void (*handler)(int), int flags, ...) if (sig == SIGSEGV) flags |= SA_NODEFER; - action.sa_flags = flags; + action.sa_flags = flags | SA_SIGINFO; action.sa_restorer = NULL; if (sigaction(sig, &action, NULL) < 0) panic("sigaction failed - errno = %d\n", errno); diff --git a/arch/um/os-Linux/sys-i386/Makefile b/arch/um/os-Linux/sys-i386/Makefile index b4bc6ac4f30b..d491754bf701 100644 --- a/arch/um/os-Linux/sys-i386/Makefile +++ b/arch/um/os-Linux/sys-i386/Makefile @@ -3,7 +3,7 @@ # Licensed under the GPL # -obj-y = registers.o signal.o task_size.o tls.o +obj-y = registers.o task_size.o tls.o USER_OBJS := $(obj-y) diff --git a/arch/um/os-Linux/sys-i386/signal.c b/arch/um/os-Linux/sys-i386/signal.c deleted file mode 100644 index f311609f93da..000000000000 --- a/arch/um/os-Linux/sys-i386/signal.c +++ /dev/null @@ -1,13 +0,0 @@ -/* - * Copyright (C) 2006 Jeff Dike (jdike@{addtoit,linux.intel}.com) - * Licensed under the GPL - */ - -#include - -extern void handle_signal(int sig, struct sigcontext *sc); - -void hard_handler(int sig) -{ - handle_signal(sig, (struct sigcontext *) (&sig + 1)); -} diff --git a/arch/um/os-Linux/sys-x86_64/Makefile b/arch/um/os-Linux/sys-x86_64/Makefile index a44a47f8f57b..58f6e0a38598 100644 --- a/arch/um/os-Linux/sys-x86_64/Makefile +++ b/arch/um/os-Linux/sys-x86_64/Makefile @@ -3,7 +3,7 @@ # Licensed under the GPL # -obj-y = registers.o prctl.o signal.o task_size.o +obj-y = registers.o prctl.o task_size.o USER_OBJS := $(obj-y) diff --git a/arch/um/os-Linux/sys-x86_64/signal.c b/arch/um/os-Linux/sys-x86_64/signal.c deleted file mode 100644 index 82a388822cd3..000000000000 --- a/arch/um/os-Linux/sys-x86_64/signal.c +++ /dev/null @@ -1,16 +0,0 @@ -/* - * Copyright (C) 2006 Jeff Dike (jdike@{addtoit,linux.intel}.com) - * Licensed under the GPL - */ - -#include - -extern void handle_signal(int sig, struct sigcontext *sc); - -void hard_handler(int sig) -{ - struct ucontext *uc; - asm("movq %%rdx, %0" : "=r" (uc)); - - handle_signal(sig, (struct sigcontext *) &uc->uc_mcontext); -}