diff options
author | David S. Miller <davem@davemloft.net> | 2008-04-27 17:52:51 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-04-27 17:52:51 -0400 |
commit | 90888816ba1bf1c4eff1e7e4220c1afc802f0fd3 (patch) | |
tree | 365fd47ce0d18d04e86a83e98ac037bce5e99057 /arch/sparc64/kernel | |
parent | 5526b7e4513c66bc1c91f661dcd518d5199f8934 (diff) |
sparc64: Clean up handling of pt_regs trap type encoding.
If we use this from more than one place, it's better to
have helpers instead of twiddling magic constants all
over.
Add pt_regs_trap_type(), pt_regs_clear_trap_type(), and
pt_regs_is_syscall().
Use them in do_signal().
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc64/kernel')
-rw-r--r-- | arch/sparc64/kernel/signal.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/sparc64/kernel/signal.c b/arch/sparc64/kernel/signal.c index 314f51aefa0f..f2d88d8f7a42 100644 --- a/arch/sparc64/kernel/signal.c +++ b/arch/sparc64/kernel/signal.c | |||
@@ -513,11 +513,10 @@ static void do_signal(struct pt_regs *regs, unsigned long orig_i0) | |||
513 | struct k_sigaction ka; | 513 | struct k_sigaction ka; |
514 | sigset_t *oldset; | 514 | sigset_t *oldset; |
515 | siginfo_t info; | 515 | siginfo_t info; |
516 | int signr, tt; | 516 | int signr; |
517 | 517 | ||
518 | tt = regs->magic & 0x1ff; | 518 | if (pt_regs_is_syscall(regs)) { |
519 | if (tt == 0x110 || tt == 0x111 || tt == 0x16d) { | 519 | pt_regs_clear_trap_type(regs); |
520 | regs->magic &= ~0x1ff; | ||
521 | cookie.restart_syscall = 1; | 520 | cookie.restart_syscall = 1; |
522 | } else | 521 | } else |
523 | cookie.restart_syscall = 0; | 522 | cookie.restart_syscall = 0; |