diff options
Diffstat (limited to 'arch/arm/kernel/signal.c')
-rw-r--r-- | arch/arm/kernel/signal.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/kernel/signal.c b/arch/arm/kernel/signal.c index 80b8b5c7e07a..614c9f642878 100644 --- a/arch/arm/kernel/signal.c +++ b/arch/arm/kernel/signal.c | |||
@@ -532,7 +532,7 @@ setup_rt_frame(int usig, struct k_sigaction *ka, siginfo_t *info, | |||
532 | return err; | 532 | return err; |
533 | } | 533 | } |
534 | 534 | ||
535 | static inline void restart_syscall(struct pt_regs *regs) | 535 | static inline void setup_syscall_restart(struct pt_regs *regs) |
536 | { | 536 | { |
537 | regs->ARM_r0 = regs->ARM_ORIG_r0; | 537 | regs->ARM_r0 = regs->ARM_ORIG_r0; |
538 | regs->ARM_pc -= thumb_mode(regs) ? 2 : 4; | 538 | regs->ARM_pc -= thumb_mode(regs) ? 2 : 4; |
@@ -567,7 +567,7 @@ handle_signal(unsigned long sig, struct k_sigaction *ka, | |||
567 | } | 567 | } |
568 | /* fallthrough */ | 568 | /* fallthrough */ |
569 | case -ERESTARTNOINTR: | 569 | case -ERESTARTNOINTR: |
570 | restart_syscall(regs); | 570 | setup_syscall_restart(regs); |
571 | } | 571 | } |
572 | } | 572 | } |
573 | 573 | ||
@@ -691,7 +691,7 @@ static int do_signal(sigset_t *oldset, struct pt_regs *regs, int syscall) | |||
691 | if (regs->ARM_r0 == -ERESTARTNOHAND || | 691 | if (regs->ARM_r0 == -ERESTARTNOHAND || |
692 | regs->ARM_r0 == -ERESTARTSYS || | 692 | regs->ARM_r0 == -ERESTARTSYS || |
693 | regs->ARM_r0 == -ERESTARTNOINTR) { | 693 | regs->ARM_r0 == -ERESTARTNOINTR) { |
694 | restart_syscall(regs); | 694 | setup_syscall_restart(regs); |
695 | } | 695 | } |
696 | } | 696 | } |
697 | single_step_set(current); | 697 | single_step_set(current); |