summaryrefslogtreecommitdiffstats
path: root/kernel/exit.c
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2000-02-23 00:40:54 +0000
committerRalf Baechle <ralf@linux-mips.org>2000-02-23 00:40:54 +0000
commit529c593ece216e4aaffd36bd940cb94f1fa63129 (patch)
tree78f1c0b805f5656aa7b0417a043c5346f700a2cf /kernel/exit.c
parent0bd079751d25808d1972baee5c4eaa1db2227257 (diff)
Merge with 2.3.43. I did ignore all modifications to the qlogicisp.c
driver due to the Origin A64 hacks.
Diffstat (limited to 'kernel/exit.c')
-rw-r--r--kernel/exit.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/exit.c b/kernel/exit.c
index 80280e821..65d72df43 100644
--- a/kernel/exit.c
+++ b/kernel/exit.c
@@ -247,6 +247,7 @@ struct mm_struct * start_lazy_tlb(void)
current->mm = NULL;
/* active_mm is still 'mm' */
atomic_inc(&mm->mm_count);
+ enter_lazy_tlb(mm, current, smp_processor_id());
return mm;
}
@@ -275,6 +276,7 @@ static inline void __exit_mm(struct task_struct * tsk)
mm_release();
if (mm != tsk->active_mm) BUG();
tsk->mm = NULL;
+ enter_lazy_tlb(mm, current, smp_processor_id());
mmput(mm);
}
}
@@ -393,9 +395,7 @@ NORET_TYPE void do_exit(long code)
if (!tsk->pid)
panic("Attempted to kill the idle task!");
tsk->flags |= PF_EXITING;
- start_bh_atomic();
- del_timer(&tsk->real_timer);
- end_bh_atomic();
+ del_timer_sync(&tsk->real_timer);
lock_kernel();
fake_volatile: