diff options
| author | Dave Airlie <airlied@starflyer.(none)> | 2005-10-22 01:24:35 -0400 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2005-10-22 01:24:35 -0400 |
| commit | 23bfc1a339e98510f2ce25a2764a0cfe195faa9e (patch) | |
| tree | 51652ad15f85d9d1367ae6f9b8641dfe46b4c501 /kernel/exit.c | |
| parent | 312f5726055534be1dc9dd369be13aabd2943fcb (diff) | |
| parent | 63172cb3d5ef762dcb60a292bc7f016b85cf6e1f (diff) | |
merge linus head to drm-mm branch
Diffstat (limited to 'kernel/exit.c')
| -rw-r--r-- | kernel/exit.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/exit.c b/kernel/exit.c index 43077732619b..3b25b182d2be 100644 --- a/kernel/exit.c +++ b/kernel/exit.c | |||
| @@ -843,6 +843,7 @@ fastcall NORET_TYPE void do_exit(long code) | |||
| 843 | group_dead = atomic_dec_and_test(&tsk->signal->live); | 843 | group_dead = atomic_dec_and_test(&tsk->signal->live); |
| 844 | if (group_dead) { | 844 | if (group_dead) { |
| 845 | del_timer_sync(&tsk->signal->real_timer); | 845 | del_timer_sync(&tsk->signal->real_timer); |
| 846 | exit_itimers(tsk->signal); | ||
| 846 | acct_process(code); | 847 | acct_process(code); |
| 847 | } | 848 | } |
| 848 | exit_mm(tsk); | 849 | exit_mm(tsk); |
