Import 2.3.12pre5

c59591e1 · Linus Torvalds · 7176b206 · c59591e1
Commit c59591e1 authored Nov 23, 2007 by Linus Torvalds
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

kernel/exit.c kernel/exit.c +4 -1

No files found.
--- 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);
 	}
 }