diff options
Diffstat (limited to 'mm/rmap.c')
| -rw-r--r-- | mm/rmap.c | 8 |
1 files changed, 2 insertions, 6 deletions
| @@ -25,7 +25,6 @@ | |||
| 25 | * page->flags PG_locked (lock_page) | 25 | * page->flags PG_locked (lock_page) |
| 26 | * hugetlbfs_i_mmap_rwsem_key (in huge_pmd_share) | 26 | * hugetlbfs_i_mmap_rwsem_key (in huge_pmd_share) |
| 27 | * mapping->i_mmap_rwsem | 27 | * mapping->i_mmap_rwsem |
| 28 | * hugetlb_fault_mutex (hugetlbfs specific page fault mutex) | ||
| 29 | * anon_vma->rwsem | 28 | * anon_vma->rwsem |
| 30 | * mm->page_table_lock or pte_lock | 29 | * mm->page_table_lock or pte_lock |
| 31 | * zone_lru_lock (in mark_page_accessed, isolate_lru_page) | 30 | * zone_lru_lock (in mark_page_accessed, isolate_lru_page) |
| @@ -1372,16 +1371,13 @@ static bool try_to_unmap_one(struct page *page, struct vm_area_struct *vma, | |||
| 1372 | * Note that the page can not be free in this function as call of | 1371 | * Note that the page can not be free in this function as call of |
| 1373 | * try_to_unmap() must hold a reference on the page. | 1372 | * try_to_unmap() must hold a reference on the page. |
| 1374 | */ | 1373 | */ |
| 1375 | mmu_notifier_range_init(&range, vma->vm_mm, vma->vm_start, | 1374 | mmu_notifier_range_init(&range, vma->vm_mm, address, |
| 1376 | min(vma->vm_end, vma->vm_start + | 1375 | min(vma->vm_end, address + |
| 1377 | (PAGE_SIZE << compound_order(page)))); | 1376 | (PAGE_SIZE << compound_order(page)))); |
| 1378 | if (PageHuge(page)) { | 1377 | if (PageHuge(page)) { |
| 1379 | /* | 1378 | /* |
| 1380 | * If sharing is possible, start and end will be adjusted | 1379 | * If sharing is possible, start and end will be adjusted |
| 1381 | * accordingly. | 1380 | * accordingly. |
| 1382 | * | ||
| 1383 | * If called for a huge page, caller must hold i_mmap_rwsem | ||
| 1384 | * in write mode as it is possible to call huge_pmd_unshare. | ||
| 1385 | */ | 1381 | */ |
| 1386 | adjust_range_if_pmd_sharing_possible(vma, &range.start, | 1382 | adjust_range_if_pmd_sharing_possible(vma, &range.start, |
| 1387 | &range.end); | 1383 | &range.end); |
