diff options
| author | Dave Kleikamp <shaggy@austin.ibm.com> | 2005-06-20 08:44:00 -0500 |
|---|---|---|
| committer | Dave Kleikamp <shaggy@austin.ibm.com> | 2005-06-20 08:44:00 -0500 |
| commit | d039ba24f135147f60a13bcaa768189a5b773b6e (patch) | |
| tree | 444b7596ab8312b5954d15c3135052a7c09c6fbe /kernel/posix-timers.c | |
| parent | 72e3148a6e987974e3e949c5668e5ca812d7c818 (diff) | |
| parent | 8b22c249e7de453961e4d253b19fc2a0bdd65d53 (diff) | |
Merge with /home/shaggy/git/linus-clean/
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 fd316c27226..cabb63fc9e1 100644 --- a/kernel/posix-timers.c +++ b/kernel/posix-timers.c @@ -1197,6 +1197,7 @@ void exit_itimers(struct signal_struct *sig) tmr = list_entry(sig->posix_timers.next, struct k_itimer, list); itimer_delete(tmr); } + del_timer_sync(&sig->real_timer); } /* |