diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-03-04 21:26:50 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-03-04 21:26:50 -0800 |
| commit | 05e7304908ec281ce4ef29d1db58ec8d6fd73563 (patch) | |
| tree | 9c3f563dfaa945e7de100631fcf2369a94e7f228 /kernel/exit.c | |
| parent | b30e09ec6aef1b9ed548da2abe7a451151479440 (diff) | |
| parent | a8e82cc7a9c42443207702560332b5dec3211525 (diff) | |
Merge bk://gkernel.bkbits.net/net-drivers-2.6
into ppc970.osdl.org:/home/torvalds/v2.6/linux
Diffstat (limited to 'kernel/exit.c')
| -rw-r--r-- | kernel/exit.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/exit.c b/kernel/exit.c index f40a50f69850..4173fa7536dc 100644 --- a/kernel/exit.c +++ b/kernel/exit.c @@ -806,8 +806,8 @@ fastcall NORET_TYPE void do_exit(long code) current->comm, current->pid, preempt_count()); - acct_update_integrals(); - update_mem_hiwater(); + acct_update_integrals(tsk); + update_mem_hiwater(tsk); group_dead = atomic_dec_and_test(&tsk->signal->live); if (group_dead) acct_process(code); |