Skip to content

Commit ecf1385

Browse files
kiryltorvalds
kiryl
authored and
torvalds
committed
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>
1 parent 3e8715f commit ecf1385

7 files changed

Lines changed: 8 additions & 10 deletions

File tree

‎arch/s390/mm/gmap.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -687,7 +687,7 @@ void gmap_discard(struct gmap *gmap, unsigned long from, unsigned long to)
687687
/* Find vma in the parent mm */
688688
vma = find_vma(gmap->mm, vmaddr);
689689
size = min(to - gaddr, PMD_SIZE - (gaddr & ~PMD_MASK));
690-
zap_page_range(vma, vmaddr, size, NULL);
690+
zap_page_range(vma, vmaddr, size);
691691
}
692692
up_read(&gmap->mm->mmap_sem);
693693
}

‎arch/x86/mm/mpx.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -796,7 +796,7 @@ static noinline int zap_bt_entries_mapping(struct mm_struct *mm,
796796
return -EINVAL;
797797

798798
len = min(vma->vm_end, end) - addr;
799-
zap_page_range(vma, addr, len, NULL);
799+
zap_page_range(vma, addr, len);
800800
trace_mpx_unmap_zap(addr, addr+len);
801801

802802
vma = vma->vm_next;

‎drivers/android/binder.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -657,7 +657,7 @@ static int binder_update_page_range(struct binder_proc *proc, int allocate,
657657
page = &proc->pages[(page_addr - proc->buffer) / PAGE_SIZE];
658658
if (vma)
659659
zap_page_range(vma, (uintptr_t)page_addr +
660-
proc->user_buffer_offset, PAGE_SIZE, NULL);
660+
proc->user_buffer_offset, PAGE_SIZE);
661661
err_vm_insert_page_failed:
662662
unmap_kernel_range((unsigned long)page_addr, PAGE_SIZE);
663663
err_map_kernel_failed:

‎drivers/staging/android/ion/ion.c‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -865,8 +865,7 @@ static void ion_buffer_sync_for_device(struct ion_buffer *buffer,
865865
list_for_each_entry(vma_list, &buffer->vmas, list) {
866866
struct vm_area_struct *vma = vma_list->vma;
867867

868-
zap_page_range(vma, vma->vm_start, vma->vm_end - vma->vm_start,
869-
NULL);
868+
zap_page_range(vma, vma->vm_start, vma->vm_end - vma->vm_start);
870869
}
871870
mutex_unlock(&buffer->lock);
872871
}

‎include/linux/mm.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1185,7 +1185,7 @@ struct page *vm_normal_page_pmd(struct vm_area_struct *vma, unsigned long addr,
11851185
int zap_vma_ptes(struct vm_area_struct *vma, unsigned long address,
11861186
unsigned long size);
11871187
void zap_page_range(struct vm_area_struct *vma, unsigned long address,
1188-
unsigned long size, struct zap_details *);
1188+
unsigned long size);
11891189
void unmap_vmas(struct mmu_gather *tlb, struct vm_area_struct *start_vma,
11901190
unsigned long start, unsigned long end);
11911191

‎mm/madvise.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -478,7 +478,7 @@ static long madvise_dontneed(struct vm_area_struct *vma,
478478
return -EINVAL;
479479

480480
madvise_userfault_dontneed(vma, prev, start, end);
481-
zap_page_range(vma, start, end - start, NULL);
481+
zap_page_range(vma, start, end - start);
482482
return 0;
483483
}
484484

‎mm/memory.c‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1370,12 +1370,11 @@ void unmap_vmas(struct mmu_gather *tlb,
13701370
* @vma: vm_area_struct holding the applicable pages
13711371
* @start: starting address of pages to zap
13721372
* @size: number of bytes to zap
1373-
* @details: details of shared cache invalidation
13741373
*
13751374
* Caller must protect the VMA list
13761375
*/
13771376
void zap_page_range(struct vm_area_struct *vma, unsigned long start,
1378-
unsigned long size, struct zap_details *details)
1377+
unsigned long size)
13791378
{
13801379
struct mm_struct *mm = vma->vm_mm;
13811380
struct mmu_gather tlb;
@@ -1386,7 +1385,7 @@ void zap_page_range(struct vm_area_struct *vma, unsigned long start,
13861385
update_hiwater_rss(mm);
13871386
mmu_notifier_invalidate_range_start(mm, start, end);
13881387
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);
13901389
mmu_notifier_invalidate_range_end(mm, start, end);
13911390
tlb_finish_mmu(&tlb, start, end);
13921391
}

0 commit comments

Comments
 (0)