aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/signal.c
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/signal.c')
-rw-r--r--kernel/signal.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/signal.c b/kernel/signal.c
index f5d4e275345e..ff046b73ff2d 100644
--- a/kernel/signal.c
+++ b/kernel/signal.c
@@ -587,7 +587,7 @@ int dequeue_signal(struct task_struct *tsk, sigset_t *mask, siginfo_t *info)
587 struct hrtimer *tmr = &tsk->signal->real_timer; 587 struct hrtimer *tmr = &tsk->signal->real_timer;
588 588
589 if (!hrtimer_is_queued(tmr) && 589 if (!hrtimer_is_queued(tmr) &&
590 tsk->signal->it_real_incr.tv64 != 0) { 590 tsk->signal->it_real_incr != 0) {
591 hrtimer_forward(tmr, tmr->base->get_time(), 591 hrtimer_forward(tmr, tmr->base->get_time(),
592 tsk->signal->it_real_incr); 592 tsk->signal->it_real_incr);
593 hrtimer_restart(tmr); 593 hrtimer_restart(tmr);
@@ -2766,7 +2766,7 @@ int copy_siginfo_to_user(siginfo_t __user *to, const siginfo_t *from)
2766int do_sigtimedwait(const sigset_t *which, siginfo_t *info, 2766int do_sigtimedwait(const sigset_t *which, siginfo_t *info,
2767 const struct timespec *ts) 2767 const struct timespec *ts)
2768{ 2768{
2769 ktime_t *to = NULL, timeout = { .tv64 = KTIME_MAX }; 2769 ktime_t *to = NULL, timeout = KTIME_MAX;
2770 struct task_struct *tsk = current; 2770 struct task_struct *tsk = current;
2771 sigset_t mask = *which; 2771 sigset_t mask = *which;
2772 int sig, ret = 0; 2772 int sig, ret = 0;
@@ -2786,7 +2786,7 @@ int do_sigtimedwait(const sigset_t *which, siginfo_t *info,
2786 2786
2787 spin_lock_irq(&tsk->sighand->siglock); 2787 spin_lock_irq(&tsk->sighand->siglock);
2788 sig = dequeue_signal(tsk, &mask, info); 2788 sig = dequeue_signal(tsk, &mask, info);
2789 if (!sig && timeout.tv64) { 2789 if (!sig && timeout) {
2790 /* 2790 /*
2791 * None ready, temporarily unblock those we're interested 2791 * None ready, temporarily unblock those we're interested
2792 * while we are sleeping in so that we'll be awakened when 2792 * while we are sleeping in so that we'll be awakened when