diff --git a/[refs] b/[refs] index ada4db38d843..11ed5ee8c126 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 91612e0df20a52f61db3cac280c153311b36df7a +refs/heads/master: 45918e1a8bfcabc1cb4570b8df276655020eac45 diff --git a/trunk/kernel/fork.c b/trunk/kernel/fork.c index 876b31cd822d..a28d11e10877 100644 --- a/trunk/kernel/fork.c +++ b/trunk/kernel/fork.c @@ -250,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;