diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2018-06-22 21:20:35 +0200 | 
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2018-06-22 21:20:35 +0200 | 
| commit | 7731b8bc94e599c9a79e428f3359ff2c34b7576a (patch) | |
| tree | 879f18ccbe274122f2d4f095b43cbc7f953e0ada /mm/rmap.c | |
| parent | 48e315618dc4dc8904182cd221e3d395d5d97005 (diff) | |
| parent | 9ffc59d57228d74809700be6f7ecb1db10292f05 (diff) | |
Merge branch 'linus' into x86/urgent
Required to queue a dependent fix.
Diffstat (limited to 'mm/rmap.c')
| -rw-r--r-- | mm/rmap.c | 6 | 
1 files changed, 3 insertions, 3 deletions
diff --git a/mm/rmap.c b/mm/rmap.c index 8d5337fed37b..6db729dc4c50 100644 --- a/mm/rmap.c +++ b/mm/rmap.c @@ -942,7 +942,7 @@ static bool page_mkclean_one(struct page *page, struct vm_area_struct *vma,  		 * downgrading page table protection not changing it to point  		 * to a new page.  		 * -		 * See Documentation/vm/mmu_notifier.txt +		 * See Documentation/vm/mmu_notifier.rst  		 */  		if (ret)  			(*cleaned)++; @@ -1599,7 +1599,7 @@ static bool try_to_unmap_one(struct page *page, struct vm_area_struct *vma,  			 * point at new page while a device still is using this  			 * page.  			 * -			 * See Documentation/vm/mmu_notifier.txt +			 * See Documentation/vm/mmu_notifier.rst  			 */  			dec_mm_counter(mm, mm_counter_file(page));  		} @@ -1609,7 +1609,7 @@ discard:  		 * done above for all cases requiring it to happen under page  		 * table lock before mmu_notifier_invalidate_range_end()  		 * -		 * See Documentation/vm/mmu_notifier.txt +		 * See Documentation/vm/mmu_notifier.rst  		 */  		page_remove_rmap(subpage, PageHuge(page));  		put_page(page);  | 
