patch-2.4.0-prerelease linux/mm/mlock.c

• Lines: 20
• Date: Fri Dec 29 14:07:24 2000
• Orig file: v2.4.0-test12/linux/mm/mlock.c
• Orig date: Sun Nov 19 18:44:23 2000

diff -u --recursive --new-file v2.4.0-test12/linux/mm/mlock.c linux/mm/mlock.c
@@ -189,9 +189,6 @@
 			break;
 		}
 	}
-	spin_lock(&current->mm->page_table_lock);
-	merge_segments(current->mm, start, end);
-	spin_unlock(&current->mm->page_table_lock);
 	return error;
 }
 
@@ -263,9 +260,6 @@
 		if (error)
 			break;
 	}
-	spin_lock(&current->mm->page_table_lock);
-	merge_segments(current->mm, 0, TASK_SIZE);
-	spin_unlock(&current->mm->page_table_lock);
 	return error;
 }