From b2e7556ef114c085e5dd19dbf45505ca014ca64f Mon Sep 17 00:00:00 2001 From: Al Viro Date: Sat, 21 Apr 2012 21:35:56 -0400 Subject: [PATCH] --- yaml --- r: 306062 b: refs/heads/master c: 6eef019002e61abdc5e4384e4154d73c9f56d2bc h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/cris/arch-v32/kernel/signal.c | 10 ++-------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index 1bd6d2806ab1..b487a6ce7154 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5d71c55bdb020561a9d44c8453ca2a3ca524ea35 +refs/heads/master: 6eef019002e61abdc5e4384e4154d73c9f56d2bc diff --git a/trunk/arch/cris/arch-v32/kernel/signal.c b/trunk/arch/cris/arch-v32/kernel/signal.c index 55905782a41b..a45efc7df748 100644 --- a/trunk/arch/cris/arch-v32/kernel/signal.c +++ b/trunk/arch/cris/arch-v32/kernel/signal.c @@ -345,10 +345,7 @@ setup_frame(int sig, struct k_sigaction *ka, sigset_t *set, return 0; give_sigsegv: - if (sig == SIGSEGV) - ka->sa.sa_handler = SIG_DFL; - - force_sig(SIGSEGV, current); + force_sigsegv(sig, current); return -EFAULT; } @@ -432,10 +429,7 @@ setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info, return 0; give_sigsegv: - if (sig == SIGSEGV) - ka->sa.sa_handler = SIG_DFL; - - force_sig(SIGSEGV, current); + force_sigsegv(sig, current); return -EFAULT; }