Merge with Linux 2.4.0-prerelease. Big Makefile rewrite, test your

Makefiles.

1 files changed, 0 insertions, 6 deletions

diff --git a/mm/mlock.c b/mm/mlock.c
index 551d61d39..16e9f947b 100644
--- a/mm/mlock.c
+++ b/mm/mlock.c
@@ -189,9 +189,6 @@ static int do_mlock(unsigned long start, size_t len, int on)
 			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 @@ static int do_mlockall(int flags)
 		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;
 }