diff options
| author | Hiroshi Shimamoto | 2008-09-06 01:27:39 +0200 |
|---|---|---|
| committer | Ingo Molnar | 2008-09-06 14:54:02 +0200 |
| commit | 8fcd8e20f388d787f6abf701b11037b122029d5b (patch) | |
| tree | 72a4b396864b72322cd047e73ff473832f09229b /arch/x86 | |
| parent | x86_32: signal: introduce signal_fault() (diff) | |
| download | kernel-qcow2-linux-8fcd8e20f388d787f6abf701b11037b122029d5b.tar.gz kernel-qcow2-linux-8fcd8e20f388d787f6abf701b11037b122029d5b.tar.xz kernel-qcow2-linux-8fcd8e20f388d787f6abf701b11037b122029d5b.zip | |
x86: signal: make NR_restart_syscall
make NR_restart_syscall macro for cosmetic unification of handle_signal().
Signed-off-by: Hiroshi Shimamoto <h-shimamoto@ct.jp.nec.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/kernel/signal_32.c | 3 | ||||
| -rw-r--r-- | arch/x86/kernel/signal_64.c | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/arch/x86/kernel/signal_32.c b/arch/x86/kernel/signal_32.c index 76d05d703845..bd9b65031a9a 100644 --- a/arch/x86/kernel/signal_32.c +++ b/arch/x86/kernel/signal_32.c @@ -572,6 +572,7 @@ handle_signal(unsigned long sig, siginfo_t *info, struct k_sigaction *ka, return 0; } +#define NR_restart_syscall __NR_restart_syscall /* * Note that 'init' is a special process: it doesn't get signals it doesn't * want to handle. Thus you cannot kill init even with a SIGKILL even by @@ -635,7 +636,7 @@ static void do_signal(struct pt_regs *regs) break; case -ERESTART_RESTARTBLOCK: - regs->ax = __NR_restart_syscall; + regs->ax = NR_restart_syscall; regs->ip -= 2; break; } diff --git a/arch/x86/kernel/signal_64.c b/arch/x86/kernel/signal_64.c index 823a55bf8c39..19e2b9143205 100644 --- a/arch/x86/kernel/signal_64.c +++ b/arch/x86/kernel/signal_64.c @@ -362,6 +362,8 @@ handle_signal(unsigned long sig, siginfo_t *info, struct k_sigaction *ka, return ret; } +#define NR_restart_syscall \ + test_thread_flag(TIF_IA32) ? __NR_ia32_restart_syscall : __NR_restart_syscall /* * Note that 'init' is a special process: it doesn't get signals it doesn't * want to handle. Thus you cannot kill init even with a SIGKILL even by @@ -423,9 +425,7 @@ static void do_signal(struct pt_regs *regs) regs->ip -= 2; break; case -ERESTART_RESTARTBLOCK: - regs->ax = test_thread_flag(TIF_IA32) ? - __NR_ia32_restart_syscall : - __NR_restart_syscall; + regs->ax = NR_restart_syscall; regs->ip -= 2; break; } |