Merge with rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git

1 files changed, 5 insertions, 2 deletions

diff --git a/kernel/fork.c b/kernel/fork.c
index f42a17f88699..a28d11e10877 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -194,6 +194,7 @@ static inline int dup_mmap(struct mm_struct * mm, struct mm_struct * oldmm)
         mm->mmap = NULL;
         mm->mmap_cache = NULL;
         mm->free_area_cache = oldmm->mmap_base;
+        mm->cached_hole_size = ~0UL;
         mm->map_count = 0;
         set_mm_counter(mm, rss, 0);
         set_mm_counter(mm, anon_rss, 0);
@@ -249,8 +250,9 @@ static inline int dup_mmap(struct mm_struct * mm, struct mm_struct * oldmm)
 
                 /*
                  * Link in the new vma and copy the page table entries:
-                 * link in first so that swapoff can see swap entries,
-                 * and try_to_unmap_one's find_vma find the new vma.
+                 * link in first so that swapoff can see swap entries.
+                 * Note that, exceptionally, here the vma is inserted
+                 * without holding mm->mmap_sem.
                  */
                 spin_lock(&mm->page_table_lock);
                 *pprev = tmp;
@@ -322,6 +324,7 @@ static struct mm_struct * mm_init(struct mm_struct * mm)
         mm->ioctx_list = NULL;
         mm->default_kioctx = (struct kioctx)INIT_KIOCTX(mm->default_kioctx, *mm);
         mm->free_area_cache = TASK_UNMAPPED_BASE;
+        mm->cached_hole_size = ~0UL;
 
         if (likely(!mm_alloc_pgd(mm))) {
                 mm->def_flags = 0;