diff options
| author | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-06-18 03:36:46 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-06-18 03:36:46 -0400 |
| commit | 0107b3cf3225aed6ddde4fa8dbcd4ed643b34f4d (patch) | |
| tree | 9b9337ae627fc56a0eda43c60860765f25efaa0b /kernel/posix-timers.c | |
| parent | 1c3f45ab2f7f879ea482501c83899505c31f7539 (diff) | |
| parent | 9ee1c939d1cb936b1f98e8d81aeffab57bae46ab (diff) | |
Merge with master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'kernel/posix-timers.c')
| -rw-r--r-- | kernel/posix-timers.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/posix-timers.c b/kernel/posix-timers.c index fd316c272260..cabb63fc9e16 100644 --- a/kernel/posix-timers.c +++ b/kernel/posix-timers.c | |||
| @@ -1197,6 +1197,7 @@ void exit_itimers(struct signal_struct *sig) | |||
| 1197 | tmr = list_entry(sig->posix_timers.next, struct k_itimer, list); | 1197 | tmr = list_entry(sig->posix_timers.next, struct k_itimer, list); |
| 1198 | itimer_delete(tmr); | 1198 | itimer_delete(tmr); |
| 1199 | } | 1199 | } |
| 1200 | del_timer_sync(&sig->real_timer); | ||
| 1200 | } | 1201 | } |
| 1201 | 1202 | ||
| 1202 | /* | 1203 | /* |