diff options
author | Hiroshi Shimamoto <h-shimamoto@ct.jp.nec.com> | 2008-10-29 21:44:08 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-10-30 06:43:47 -0400 |
commit | 96bf84b71255b0ee4fcee91e9acd1b5e73030eaf (patch) | |
tree | 5432c3d9fded92814891d2f99d990e2a224e74de | |
parent | fd4a2030a358b4818646031049d9631bd45b9915 (diff) |
x86: signal: cosmetic unification of signr_convert()
Impact: cleanup
Make signr_convert() same.
Signed-off-by: Hiroshi Shimamoto <h-shimamoto@ct.jp.nec.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r-- | arch/x86/kernel/signal_32.c | 2 | ||||
-rw-r--r-- | arch/x86/kernel/signal_64.c | 6 |
2 files changed, 8 insertions, 0 deletions
diff --git a/arch/x86/kernel/signal_32.c b/arch/x86/kernel/signal_32.c index 85a0d37cdae9..abf0df700fd0 100644 --- a/arch/x86/kernel/signal_32.c +++ b/arch/x86/kernel/signal_32.c | |||
@@ -503,10 +503,12 @@ static int __setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info, | |||
503 | */ | 503 | */ |
504 | static int signr_convert(int sig) | 504 | static int signr_convert(int sig) |
505 | { | 505 | { |
506 | #ifdef CONFIG_X86_32 | ||
506 | struct thread_info *info = current_thread_info(); | 507 | struct thread_info *info = current_thread_info(); |
507 | 508 | ||
508 | if (info->exec_domain && info->exec_domain->signal_invmap && sig < 32) | 509 | if (info->exec_domain && info->exec_domain->signal_invmap && sig < 32) |
509 | return info->exec_domain->signal_invmap[sig]; | 510 | return info->exec_domain->signal_invmap[sig]; |
511 | #endif /* CONFIG_X86_32 */ | ||
510 | return sig; | 512 | return sig; |
511 | } | 513 | } |
512 | 514 | ||
diff --git a/arch/x86/kernel/signal_64.c b/arch/x86/kernel/signal_64.c index 3d0deb336745..a4b46e6392b1 100644 --- a/arch/x86/kernel/signal_64.c +++ b/arch/x86/kernel/signal_64.c | |||
@@ -295,6 +295,12 @@ static int __setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info, | |||
295 | */ | 295 | */ |
296 | static int signr_convert(int sig) | 296 | static int signr_convert(int sig) |
297 | { | 297 | { |
298 | #ifdef CONFIG_X86_32 | ||
299 | struct thread_info *info = current_thread_info(); | ||
300 | |||
301 | if (info->exec_domain && info->exec_domain->signal_invmap && sig < 32) | ||
302 | return info->exec_domain->signal_invmap[sig]; | ||
303 | #endif /* CONFIG_X86_32 */ | ||
298 | return sig; | 304 | return sig; |
299 | } | 305 | } |
300 | 306 | ||