The patch titled
Subject: mm-migration-fix-migration-of-huge-pmd-shared-pages-v7
has been removed from the -mm tree. Its filename was
mm-migration-fix-migration-of-huge-pmd-shared-pages-v7.patch
This patch was dropped because it was folded into mm-migration-fix-migration-of-huge-pmd-shared-pages.patch
------------------------------------------------------
From: Mike Kravetz <mike.kravetz@xxxxxxxxxx>
Subject: mm-migration-fix-migration-of-huge-pmd-shared-pages-v7
make _range_in_vma() a static inline
Link: http://lkml.kernel.org/r/6063f215-a5c8-2f0c-465a-2c515ddc952d@xxxxxxxxxx
Fixes: 39dde65c9940 ("shared page table for hugetlb page")
Signed-off-by: Mike Kravetz <mike.kravetz@xxxxxxxxxx>
Cc: Michal Hocko <mhocko@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
include/linux/mm.h | 6 ++++++
mm/hugetlb.c | 7 ++-----
2 files changed, 8 insertions(+), 5 deletions(-)
--- a/include/linux/mm.h~mm-migration-fix-migration-of-huge-pmd-shared-pages-v7
+++ a/include/linux/mm.h
@@ -2455,6 +2455,12 @@ static inline struct vm_area_struct *fin
return vma;
}
+static inline bool range_in_vma(struct vm_area_struct *vma,
+ unsigned long start, unsigned long end)
+{
+ return (vma && vma->vm_start <= start && end <= vma->vm_end);
+}
+
#ifdef CONFIG_MMU
pgprot_t vm_get_page_prot(unsigned long vm_flags);
void vma_set_page_prot(struct vm_area_struct *vma);
--- a/mm/hugetlb.c~mm-migration-fix-migration-of-huge-pmd-shared-pages-v7
+++ a/mm/hugetlb.c
@@ -4537,9 +4537,6 @@ static unsigned long page_table_shareabl
return saddr;
}
-#define _range_in_vma(vma, start, end) \
- ((vma)->vm_start <= (start) && (end) <= (vma)->vm_end)
-
static bool vma_shareable(struct vm_area_struct *vma, unsigned long addr)
{
unsigned long base = addr & PUD_MASK;
@@ -4548,7 +4545,7 @@ static bool vma_shareable(struct vm_area
/*
* check on proper vm_flags and page table alignment
*/
- if (vma->vm_flags & VM_MAYSHARE && _range_in_vma(vma, base, end))
+ if (vma->vm_flags & VM_MAYSHARE && range_in_vma(vma, base, end))
return true;
return false;
}
@@ -4573,7 +4570,7 @@ void adjust_range_if_pmd_sharing_possibl
/*
* If sharing is possible, adjust start/end if necessary.
*/
- if (_range_in_vma(vma, a_start, a_end)) {
+ if (range_in_vma(vma, a_start, a_end)) {
if (a_start < *start)
*start = a_start;
if (a_end > *end)
_
Patches currently in -mm which might be from mike.kravetz@xxxxxxxxxx are
mm-migration-fix-migration-of-huge-pmd-shared-pages.patch
hugetlb-take-pmd-sharing-into-account-when-flushing-tlb-caches.patch
