diff options
| author | Oleg Nesterov <oleg@tv-sign.ru> | 2008-07-23 20:52:05 +0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2008-07-24 01:26:08 +0200 |
| commit | 54da1174922cddd4be83d5a364b2e0fdd693f513 (patch) | |
| tree | 9ecd24b3fbe314421f25223b1fa738f0265d52a5 /kernel/posix-timers.c | |
| parent | 81d50bb254ed53a0da45a65988e4e1fa08e8a541 (diff) | |
| download | kernel-crypto-54da1174922cddd4be83d5a364b2e0fdd693f513.tar.gz kernel-crypto-54da1174922cddd4be83d5a364b2e0fdd693f513.tar.xz kernel-crypto-54da1174922cddd4be83d5a364b2e0fdd693f513.zip | |
posix-timers: do_schedule_next_timer: fix the setting of ->si_overrun
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>
Diffstat (limited to 'kernel/posix-timers.c')
| -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 dbd8398ddb0..814a2bb8d2e 100644 --- a/kernel/posix-timers.c +++ b/kernel/posix-timers.c @@ -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) |