aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKirill A. Shutemov <kirill.shutemov@linux.intel.com>2017-02-22 18:46:37 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2017-02-22 19:41:30 -0500
commitecf1385d72f0491400a8ceca7001196ca369aa8c (patch)
tree6304ac224dcb77441b9f567ac75ac81616e34ac8
parent3e8715fdc03e8df4d26d8e436166e44e3e416d3b (diff)
mm: drop unused argument of zap_page_range()
There's no users of zap_page_range() who wants non-NULL 'details'. Let's drop it. Link: http://lkml.kernel.org/r/20170118122429.43661-3-kirill.shutemov@linux.intel.com Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com> Acked-by: Michal Hocko <mhocko@suse.com> Cc: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Rik van Riel <riel@redhat.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--arch/s390/mm/gmap.c2
-rw-r--r--arch/x86/mm/mpx.c2
-rw-r--r--drivers/android/binder.c2
-rw-r--r--drivers/staging/android/ion/ion.c3
-rw-r--r--include/linux/mm.h2
-rw-r--r--mm/madvise.c2
-rw-r--r--mm/memory.c5
7 files changed, 8 insertions, 10 deletions
diff --git a/arch/s390/mm/gmap.c b/arch/s390/mm/gmap.c
index ec1f0dedb948..59ac93714fa4 100644
--- a/arch/s390/mm/gmap.c
+++ b/arch/s390/mm/gmap.c
@@ -687,7 +687,7 @@ void gmap_discard(struct gmap *gmap, unsigned long from, unsigned long to)
687 /* Find vma in the parent mm */ 687 /* Find vma in the parent mm */
688 vma = find_vma(gmap->mm, vmaddr); 688 vma = find_vma(gmap->mm, vmaddr);
689 size = min(to - gaddr, PMD_SIZE - (gaddr & ~PMD_MASK)); 689 size = min(to - gaddr, PMD_SIZE - (gaddr & ~PMD_MASK));
690 zap_page_range(vma, vmaddr, size, NULL); 690 zap_page_range(vma, vmaddr, size);
691 } 691 }
692 up_read(&gmap->mm->mmap_sem); 692 up_read(&gmap->mm->mmap_sem);
693} 693}
diff --git a/arch/x86/mm/mpx.c b/arch/x86/mm/mpx.c
index af59f808742f..aad4ac386f98 100644
--- a/arch/x86/mm/mpx.c
+++ b/arch/x86/mm/mpx.c
@@ -796,7 +796,7 @@ static noinline int zap_bt_entries_mapping(struct mm_struct *mm,
796 return -EINVAL; 796 return -EINVAL;
797 797
798 len = min(vma->vm_end, end) - addr; 798 len = min(vma->vm_end, end) - addr;
799 zap_page_range(vma, addr, len, NULL); 799 zap_page_range(vma, addr, len);
800 trace_mpx_unmap_zap(addr, addr+len); 800 trace_mpx_unmap_zap(addr, addr+len);
801 801
802 vma = vma->vm_next; 802 vma = vma->vm_next;
diff --git a/drivers/android/binder.c b/drivers/android/binder.c
index 9451b762fa1c..15b263a420e8 100644
--- a/drivers/android/binder.c
+++ b/drivers/android/binder.c
@@ -657,7 +657,7 @@ free_range:
657 page = &proc->pages[(page_addr - proc->buffer) / PAGE_SIZE]; 657 page = &proc->pages[(page_addr - proc->buffer) / PAGE_SIZE];
658 if (vma) 658 if (vma)
659 zap_page_range(vma, (uintptr_t)page_addr + 659 zap_page_range(vma, (uintptr_t)page_addr +
660 proc->user_buffer_offset, PAGE_SIZE, NULL); 660 proc->user_buffer_offset, PAGE_SIZE);
661err_vm_insert_page_failed: 661err_vm_insert_page_failed:
662 unmap_kernel_range((unsigned long)page_addr, PAGE_SIZE); 662 unmap_kernel_range((unsigned long)page_addr, PAGE_SIZE);
663err_map_kernel_failed: 663err_map_kernel_failed:
diff --git a/drivers/staging/android/ion/ion.c b/drivers/staging/android/ion/ion.c
index 937c2d5d7ec3..969600779e44 100644
--- a/drivers/staging/android/ion/ion.c
+++ b/drivers/staging/android/ion/ion.c
@@ -865,8 +865,7 @@ static void ion_buffer_sync_for_device(struct ion_buffer *buffer,
865 list_for_each_entry(vma_list, &buffer->vmas, list) { 865 list_for_each_entry(vma_list, &buffer->vmas, list) {
866 struct vm_area_struct *vma = vma_list->vma; 866 struct vm_area_struct *vma = vma_list->vma;
867 867
868 zap_page_range(vma, vma->vm_start, vma->vm_end - vma->vm_start, 868 zap_page_range(vma, vma->vm_start, vma->vm_end - vma->vm_start);
869 NULL);
870 } 869 }
871 mutex_unlock(&buffer->lock); 870 mutex_unlock(&buffer->lock);
872} 871}
diff --git a/include/linux/mm.h b/include/linux/mm.h
index 062936e8b832..574bc157a27c 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -1185,7 +1185,7 @@ struct page *vm_normal_page_pmd(struct vm_area_struct *vma, unsigned long addr,
1185int zap_vma_ptes(struct vm_area_struct *vma, unsigned long address, 1185int zap_vma_ptes(struct vm_area_struct *vma, unsigned long address,
1186 unsigned long size); 1186 unsigned long size);
1187void zap_page_range(struct vm_area_struct *vma, unsigned long address, 1187void zap_page_range(struct vm_area_struct *vma, unsigned long address,
1188 unsigned long size, struct zap_details *); 1188 unsigned long size);
1189void unmap_vmas(struct mmu_gather *tlb, struct vm_area_struct *start_vma, 1189void unmap_vmas(struct mmu_gather *tlb, struct vm_area_struct *start_vma,
1190 unsigned long start, unsigned long end); 1190 unsigned long start, unsigned long end);
1191 1191
diff --git a/mm/madvise.c b/mm/madvise.c
index ca75b8a01ba0..7f1490f0d3a6 100644
--- a/mm/madvise.c
+++ b/mm/madvise.c
@@ -478,7 +478,7 @@ static long madvise_dontneed(struct vm_area_struct *vma,
478 return -EINVAL; 478 return -EINVAL;
479 479
480 madvise_userfault_dontneed(vma, prev, start, end); 480 madvise_userfault_dontneed(vma, prev, start, end);
481 zap_page_range(vma, start, end - start, NULL); 481 zap_page_range(vma, start, end - start);
482 return 0; 482 return 0;
483} 483}
484 484
diff --git a/mm/memory.c b/mm/memory.c
index e9035a0afee2..7663068a33c6 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -1370,12 +1370,11 @@ void unmap_vmas(struct mmu_gather *tlb,
1370 * @vma: vm_area_struct holding the applicable pages 1370 * @vma: vm_area_struct holding the applicable pages
1371 * @start: starting address of pages to zap 1371 * @start: starting address of pages to zap
1372 * @size: number of bytes to zap 1372 * @size: number of bytes to zap
1373 * @details: details of shared cache invalidation
1374 * 1373 *
1375 * Caller must protect the VMA list 1374 * Caller must protect the VMA list
1376 */ 1375 */
1377void zap_page_range(struct vm_area_struct *vma, unsigned long start, 1376void zap_page_range(struct vm_area_struct *vma, unsigned long start,
1378 unsigned long size, struct zap_details *details) 1377 unsigned long size)
1379{ 1378{
1380 struct mm_struct *mm = vma->vm_mm; 1379 struct mm_struct *mm = vma->vm_mm;
1381 struct mmu_gather tlb; 1380 struct mmu_gather tlb;
@@ -1386,7 +1385,7 @@ void zap_page_range(struct vm_area_struct *vma, unsigned long start,
1386 update_hiwater_rss(mm); 1385 update_hiwater_rss(mm);
1387 mmu_notifier_invalidate_range_start(mm, start, end); 1386 mmu_notifier_invalidate_range_start(mm, start, end);
1388 for ( ; vma && vma->vm_start < end; vma = vma->vm_next) 1387 for ( ; vma && vma->vm_start < end; vma = vma->vm_next)
1389 unmap_single_vma(&tlb, vma, start, end, details); 1388 unmap_single_vma(&tlb, vma, start, end, NULL);
1390 mmu_notifier_invalidate_range_end(mm, start, end); 1389 mmu_notifier_invalidate_range_end(mm, start, end);
1391 tlb_finish_mmu(&tlb, start, end); 1390 tlb_finish_mmu(&tlb, start, end);
1392} 1391}