summaryrefslogtreecommitdiffstats
path: root/kernel/posix-timers.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2005-06-17 11:36:36 +0200
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-17 19:03:50 +0200
commitcaf2857ac6e0ba2651e722f05d5f7d3ec8ef2615 (patch)
treecb8e51e7c17c0964bdfd29635d51da0124d0dfe8 /kernel/posix-timers.c
parentMerge master.kernel.org:/home/rmk/linux-2.6-arm (diff)
downloadlinux-caf2857ac6e0ba2651e722f05d5f7d3ec8ef2615.tar.xz
linux-caf2857ac6e0ba2651e722f05d5f7d3ec8ef2615.zip
[PATCH] timer exit cleanup
Do all timer zapping in exit_itimers. Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'kernel/posix-timers.c')
-rw-r--r--kernel/posix-timers.c1
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)
tmr = list_entry(sig->posix_timers.next, struct k_itimer, list);
itimer_delete(tmr);
}
+ del_timer_sync(&sig->real_timer);
}
/*