]> err.no Git - linux-2.6/commitdiff
posix-timers: do_schedule_next_timer: fix the setting of ->si_overrun
authorOleg Nesterov <oleg@tv-sign.ru>
Wed, 23 Jul 2008 16:52:05 +0000 (20:52 +0400)
committerThomas Gleixner <tglx@linutronix.de>
Wed, 23 Jul 2008 23:26:08 +0000 (01:26 +0200)
do_schedule_next_timer() sets info->si_overrun = timr->it_overrun_last,
this discards the already accumulated overruns.

Signed-off-by: Oleg Nesterov <oleg@tv-sign.ru>
Cc: Mark McLoughlin <markmc@redhat.com>
Cc: Oliver Pinter <oliver.pntr@gmail.com>
Cc: Roland McGrath <roland@redhat.com>
Cc: stable@kernel.org
Cc: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
kernel/posix-timers.c

index dbd8398ddb0b41fa1f391849b82199078e72de70..814a2bb8d2eaf92e30a61a0596a691ee1e7a6d35 100644 (file)
@@ -289,7 +289,7 @@ void do_schedule_next_timer(struct siginfo *info)
                else
                        schedule_next_timer(timr);
 
-               info->si_overrun = timr->it_overrun_last;
+               info->si_overrun += timr->it_overrun_last;
        }
 
        if (timr)