The patch titled
Subject: mm/userfaultfd: fix a GCC compilation warning
has been removed from the -mm tree. Its filename was
hugetlb-remove-unused-hstate-in-hugetlb_fault_mutex_hash-fix-fix.patch
This patch was dropped because it was folded into hugetlb-remove-unused-hstate-in-hugetlb_fault_mutex_hash.patch
------------------------------------------------------
From: Qian Cai <cai@xxxxxx>
Subject: mm/userfaultfd: fix a GCC compilation warning
The linux-next commit
"hugetlb-remove-unused-hstate-in-hugetlb_fault_mutex_hash-fix" seems
accidentally add back an unused variable that was correctly removed in
the commit "hugetlb: remove unused hstate in hugetlb_fault_mutex_hash()"
[1].
mm/userfaultfd.c: In function '__mcopy_atomic_hugetlb':
mm/userfaultfd.c:217:17: warning: variable 'h' set but not used
[-Wunused-but-set-variable]
struct hstate *h;
^
[1] http://lkml.kernel.org/r/20191005003302.785-1-richardw.yang@xxxxxxxxxxxxxxx
Link: http://lkml.kernel.org/r/1570544108-32331-1-git-send-email-cai@xxxxxx
Signed-off-by: Qian Cai <cai@xxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/userfaultfd.c | 3 ---
1 file changed, 3 deletions(-)
--- a/mm/userfaultfd.c~hugetlb-remove-unused-hstate-in-hugetlb_fault_mutex_hash-fix-fix
+++ a/mm/userfaultfd.c
@@ -184,7 +184,6 @@ static __always_inline ssize_t __mcopy_a
unsigned long src_addr, dst_addr;
long copied;
struct page *page;
- struct hstate *h;
unsigned long vma_hpagesize;
pgoff_t idx;
u32 hash;
@@ -256,8 +255,6 @@ retry:
goto out_unlock;
}
- h = hstate_vma(dst_vma);
-
while (src_addr < src_start + len) {
pte_t dst_pteval;
_
Patches currently in -mm which might be from cai@xxxxxx are
hugetlb-remove-unused-hstate-in-hugetlb_fault_mutex_hash.patch
