---

yaml --- r: 306062 b: refs/heads/master c: 6eef019 h: refs/heads/master v: v3
git-mirror · May 22, 2012 · b2e7556 · b2e7556
1 parent c854a3f
commit b2e7556
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 9 deletions.
diff --git 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
@@ -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;
 }