diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-03-19 01:28:40 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-03-19 01:28:40 +0000 |
| commit | 8abb719409c9060a7c0676f76e9182c1e0b8ca46 (patch) | |
| tree | b88cc5a6cd513a04a512b7e6215c873c90a1c5dd /kernel/exit.c | |
| parent | f01bd7aeafd95a08aafc9e3636bb26974df69d82 (diff) | |
Merge with 2.3.99-pre1.
Diffstat (limited to 'kernel/exit.c')
| -rw-r--r-- | kernel/exit.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/kernel/exit.c b/kernel/exit.c index 333981ab9..4684b8c37 100644 --- a/kernel/exit.c +++ b/kernel/exit.c @@ -55,8 +55,8 @@ void release(struct task_struct * p) * was given away by the parent in the first place.) */ current->counter += p->counter; - if (current->counter > current->priority) - current->counter = current->priority; + if (current->counter >= current->priority*2) + current->counter = current->priority*2-1; free_task_struct(p); } else { printk("task releasing itself\n"); @@ -425,8 +425,7 @@ fake_volatile: tsk->exit_code = code; exit_notify(); task_unlock(tsk); - if (tsk->exec_domain && tsk->exec_domain->module) - __MOD_DEC_USE_COUNT(tsk->exec_domain->module); + put_exec_domain(tsk->exec_domain); if (tsk->binfmt && tsk->binfmt->module) __MOD_DEC_USE_COUNT(tsk->binfmt->module); schedule(); |