The patch titled
Subject: hugetlb-remove-unused-hstate-in-hugetlb_fault_mutex_hash-fix
has been removed from the -mm tree. Its filename was
hugetlb-remove-unused-hstate-in-hugetlb_fault_mutex_hash-fix.patch
This patch was dropped because it was folded into hugetlb-remove-unused-hstate-in-hugetlb_fault_mutex_hash.patch
------------------------------------------------------
From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Subject: hugetlb-remove-unused-hstate-in-hugetlb_fault_mutex_hash-fix
various build fixes
Cc: Wei Yang <richardw.yang@xxxxxxxxxxxxxxx>
Cc: Mike Kravetz <mike.kravetz@xxxxxxxxxx>
Cc: Hugh Dickins <hughd@xxxxxxxxxx>
Cc: Andrea Arcangeli <aarcange@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
fs/hugetlbfs/inode.c | 4 ++--
include/linux/hugetlb.h | 3 +--
mm/userfaultfd.c | 3 +++
3 files changed, 6 insertions(+), 4 deletions(-)
--- a/fs/hugetlbfs/inode.c~hugetlb-remove-unused-hstate-in-hugetlb_fault_mutex_hash-fix
+++ a/fs/hugetlbfs/inode.c
@@ -440,7 +440,7 @@ static void remove_inode_hugepages(struc
u32 hash;
index = page->index;
- hash = hugetlb_fault_mutex_hash(h, mapping, index);
+ hash = hugetlb_fault_mutex_hash(mapping, index);
mutex_lock(&hugetlb_fault_mutex_table[hash]);
/*
@@ -644,7 +644,7 @@ static long hugetlbfs_fallocate(struct f
addr = index * hpage_size;
/* mutex taken here, fault path and hole punch */
- hash = hugetlb_fault_mutex_hash(h, mapping, index);
+ hash = hugetlb_fault_mutex_hash(mapping, index);
mutex_lock(&hugetlb_fault_mutex_table[hash]);
/* See if already present in mapping to avoid alloc/free */
--- a/include/linux/hugetlb.h~hugetlb-remove-unused-hstate-in-hugetlb_fault_mutex_hash-fix
+++ a/include/linux/hugetlb.h
@@ -105,8 +105,7 @@ void move_hugetlb_state(struct page *old
void free_huge_page(struct page *page);
void hugetlb_fix_reserve_counts(struct inode *inode);
extern struct mutex *hugetlb_fault_mutex_table;
-u32 hugetlb_fault_mutex_hash(struct hstate *h, struct address_space *mapping,
- pgoff_t idx);
+u32 hugetlb_fault_mutex_hash(struct address_space *mapping, pgoff_t idx);
pte_t *huge_pmd_share(struct mm_struct *mm, unsigned long addr, pud_t *pud);
--- a/mm/userfaultfd.c~hugetlb-remove-unused-hstate-in-hugetlb_fault_mutex_hash-fix
+++ a/mm/userfaultfd.c
@@ -184,6 +184,7 @@ 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;
@@ -255,6 +256,8 @@ 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 akpm@xxxxxxxxxxxxxxxxxxxx are
hugetlb-remove-unused-hstate-in-hugetlb_fault_mutex_hash.patch
mm-madvise-replace-with-page_size-in-madvise_inject_error-fix.patch
mm-annotate-refault-stalls-from-swap_readpage-fix.patch
