diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-06-20 12:35:34 -0400 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-06-20 12:35:34 -0400 |
| commit | 8ba08378b479f472b37b83542c31bdad465033cf (patch) | |
| tree | f4421227b3065e786c9041cf0ce0073a249e011b /kernel/posix-timers.c | |
| parent | 34b727c135ff651f153be5757056d25678b6d018 (diff) | |
| parent | 8b22c249e7de453961e4d253b19fc2a0bdd65d53 (diff) | |
Auto merge with /home/aegl/GIT/linus
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 | /* |