diff options
| author | Oleg Nesterov <oleg@tv-sign.ru> | 2008-08-12 15:30:09 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-08-20 11:15:24 -0700 |
| commit | 91e647388fa35ec69e3b3f1b84b2b3f4f4bb15c1 (patch) | |
| tree | dc8c576c5c8446ed15677e0fefba03cd83d1fbc7 | |
| parent | 1a78633026ad482dd9d79ad85436a33ddc3050ed (diff) | |
| download | lwn-91e647388fa35ec69e3b3f1b84b2b3f4f4bb15c1.tar.gz lwn-91e647388fa35ec69e3b3f1b84b2b3f4f4bb15c1.zip | |
posix-timers: do_schedule_next_timer: fix the setting of ->si_overrun
commit 54da1174922cddd4be83d5a364b2e0fdd693f513 upstream
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: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | kernel/posix-timers.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/posix-timers.c b/kernel/posix-timers.c index 69181f82916a..bd908547fc75 100644 --- a/kernel/posix-timers.c +++ b/kernel/posix-timers.c @@ -290,7 +290,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) |