From b5c8a97d5085738b62ecd9c0b14574b3ef384bec Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 13 Aug 2020 09:51:51 +0200 Subject: [PATCH] ANDROID: fix up 60500a42286d ("ANDROID: mm: add a field to store names for private anonymous memory") In the mainline commit 64019a2e467a ("mm/gup: remove task_struct pointer for all gup code"), get_user_pages_remote() removed a parameter, which broke the build in the fs/proc/task_mmu.c file due to the previously mentioned android-only change. Fix this up by correcting the parameters for this call. Bug: 120441514 Cc: Dmitry Shmidt Cc: Amit Pundir Signed-off-by: Greg Kroah-Hartman Change-Id: I753c22c298d0397b625daf28fe89182e074ac540 --- fs/proc/task_mmu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c index b5b31f8dd887..d9977f88bab0 100644 --- a/fs/proc/task_mmu.c +++ b/fs/proc/task_mmu.c @@ -147,8 +147,8 @@ static void seq_print_vma_name(struct seq_file *m, struct vm_area_struct *vma) long pages_pinned; struct page *page; - pages_pinned = get_user_pages_remote(current, mm, - page_start_vaddr, 1, 0, &page, NULL, NULL); + pages_pinned = get_user_pages_remote(mm, page_start_vaddr, 1, 0, + &page, NULL, NULL); if (pages_pinned < 1) { seq_puts(m, "]"); return;