Import 2.3.12pre5

diff --git a/kernel/exit.c b/kernel/exit.c
index d95a32f65a76293b9eedb90e7ab065befbda7f26..ed15c604d76648cc56c95036ce5779b15d093535 100644 (file)
--- a/kernel/exit.c
+++ b/kernel/exit.c
@@ -266,9 +266,12 @@ static inline void __exit_mm(struct task_struct * tsk)
        struct mm_struct * mm = tsk->mm;
 
        if (mm) {
+               atomic_inc(&init_mm.mm_count);
                mm_release();
-               atomic_inc(&mm->mm_count);
+               if (mm != tsk->active_mm) BUG();
                tsk->mm = NULL;
+               tsk->active_mm = &init_mm;
+               switch_mm(mm, &init_mm);
                mmput(mm);
        }
 }