aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndi Kleen <ak@suse.de>2006-09-26 04:52:41 -0400
committerAndi Kleen <andi@basil.nowhere.org>2006-09-26 04:52:41 -0400
commitdd54a11004b2c9a1f136225f880e021a43b0eadc (patch)
tree34940fe0eae0738634440e75052bd6c2bb4ab23b
parent2049336f60d297c85ac977245b9326ec00396114 (diff)
[PATCH] Remove all traces of signal number conversion
This was old code that was needed for iBCS and x86-64 never supported that. Pointed out by Albert Cahalan Signed-off-by: Andi Kleen <ak@suse.de>
-rw-r--r--arch/x86_64/ia32/ia32_signal.c10
-rw-r--r--arch/x86_64/kernel/signal.c5
2 files changed, 1 insertions, 14 deletions
diff --git a/arch/x86_64/ia32/ia32_signal.c b/arch/x86_64/ia32/ia32_signal.c
index 549de439fb2d..2d20f8304b31 100644
--- a/arch/x86_64/ia32/ia32_signal.c
+++ b/arch/x86_64/ia32/ia32_signal.c
@@ -431,15 +431,7 @@ int ia32_setup_frame(int sig, struct k_sigaction *ka,
431 if (!access_ok(VERIFY_WRITE, frame, sizeof(*frame))) 431 if (!access_ok(VERIFY_WRITE, frame, sizeof(*frame)))
432 goto give_sigsegv; 432 goto give_sigsegv;
433 433
434 { 434 err |= __put_user(sig, &frame->sig);
435 struct exec_domain *ed = current_thread_info()->exec_domain;
436 err |= __put_user((ed
437 && ed->signal_invmap
438 && sig < 32
439 ? ed->signal_invmap[sig]
440 : sig),
441 &frame->sig);
442 }
443 if (err) 435 if (err)
444 goto give_sigsegv; 436 goto give_sigsegv;
445 437
diff --git a/arch/x86_64/kernel/signal.c b/arch/x86_64/kernel/signal.c
index 7f58bc9a056d..49ec324cd141 100644
--- a/arch/x86_64/kernel/signal.c
+++ b/arch/x86_64/kernel/signal.c
@@ -277,11 +277,6 @@ static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
277#endif 277#endif
278 278
279 /* Set up registers for signal handler */ 279 /* Set up registers for signal handler */
280 {
281 struct exec_domain *ed = current_thread_info()->exec_domain;
282 if (unlikely(ed && ed->signal_invmap && sig < 32))
283 sig = ed->signal_invmap[sig];
284 }
285 regs->rdi = sig; 280 regs->rdi = sig;
286 /* In case the signal handler was declared without prototypes */ 281 /* In case the signal handler was declared without prototypes */
287 regs->rax = 0; 282 regs->rax = 0;