diff options
| author | Dave Kleikamp <shaggy@austin.ibm.com> | 2005-08-10 12:15:13 -0400 |
|---|---|---|
| committer | Dave Kleikamp <shaggy@austin.ibm.com> | 2005-08-10 12:15:13 -0400 |
| commit | 2d610b80e954045ccfc27558f84e482709e5e5b7 (patch) | |
| tree | 840b3bb52adba07b6f1e4ddf2beb5ad5df480486 /kernel/posix-timers.c | |
| parent | 8a9cd6d676728792aaee31f30015d284acd154a3 (diff) | |
| parent | 86b3786078d63242d3194ffc58ae8dae1d1bbef3 (diff) | |
Merge with /home/shaggy/git/linus-clean/
Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
Diffstat (limited to 'kernel/posix-timers.c')
| -rw-r--r-- | kernel/posix-timers.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/kernel/posix-timers.c b/kernel/posix-timers.c index 10b2ad749d14..38798a2ff994 100644 --- a/kernel/posix-timers.c +++ b/kernel/posix-timers.c | |||
| @@ -1166,7 +1166,6 @@ void exit_itimers(struct signal_struct *sig) | |||
| 1166 | tmr = list_entry(sig->posix_timers.next, struct k_itimer, list); | 1166 | tmr = list_entry(sig->posix_timers.next, struct k_itimer, list); |
| 1167 | itimer_delete(tmr); | 1167 | itimer_delete(tmr); |
| 1168 | } | 1168 | } |
| 1169 | del_timer_sync(&sig->real_timer); | ||
| 1170 | } | 1169 | } |
| 1171 | 1170 | ||
| 1172 | /* | 1171 | /* |