Merge with Linux 2.4.0-test6-pre9.

1 files changed, 11 insertions, 14 deletions

diff --git a/include/asm-mips64/mmu_context.h b/include/asm-mips64/mmu_context.h
index 0a31078da..0fe300bda 100644
--- a/include/asm-mips64/mmu_context.h
+++ b/include/asm-mips64/mmu_context.h
@@ -76,20 +76,17 @@ init_new_context(struct task_struct *tsk, struct mm_struct *mm)
 #ifndef CONFIG_SMP
 	mm->context = 0;
 #else
-	/* Make sure not to do anything during a clone-vm operation */
-	if ((current == tsk) || (current->mm != mm)) {
-		mm->context = (unsigned long)kmalloc(smp_num_cpus * 
-					sizeof(unsigned long), GFP_KERNEL);
-		/*
-	 	 * Init the "context" values so that a tlbpid allocation 
-	 	 * happens on the first switch.
-	 	 */
-		if (mm->context)
-			memset((void *)mm->context, 0, smp_num_cpus * 
-							sizeof(unsigned long));
-		else
-			printk("Warning: init_new_context failed\n");
-	}
+	mm->context = (unsigned long)kmalloc(smp_num_cpus * 
+				sizeof(unsigned long), GFP_KERNEL);
+	/*
+ 	 * Init the "context" values so that a tlbpid allocation 
+	 * happens on the first switch.
+ 	 */
+	if (mm->context)
+		memset((void *)mm->context, 0, smp_num_cpus * 
+						sizeof(unsigned long));
+	else
+		printk("Warning: init_new_context failed\n");
 #endif
 }