[folded-merged] mm-add-page_check_address_transhuge-helper-fix.patch removed from -mm tree

[folded-merged] mm-add-page_check_address_transhuge-helper-fix.patch removed from -mm tree

[akpm]

The patch titled
     Subject: mm-add-page_check_address_transhuge-helper-fix
has been removed from the -mm tree.  Its filename was
     mm-add-page_check_address_transhuge-helper-fix.patch

This patch was dropped because it was folded into mm-add-page_check_address_transhuge-helper.patch

------------------------------------------------------
From: Vladimir Davydov <vdavydov@virtuozzo.com>
Subject: mm-add-page_check_address_transhuge-helper-fix

mm/built-in.o: In function `page_referenced_one':
rmap.c:(.text+0x32070): undefined reference to `pmdp_clear_flush_young'

Tested-by: Sergey Senozhatsky <sergey.senozhatsky.work@gmail.com>
Cc: "Kirill A. Shutemov" <kirill@shutemov.name>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 include/linux/rmap.h |   11 +++++++++++
 mm/rmap.c            |    2 ++
 2 files changed, 13 insertions(+)

diff -puN include/linux/rmap.h~mm-add-page_check_address_transhuge-helper-fix include/linux/rmap.h
--- a/include/linux/rmap.h~mm-add-page_check_address_transhuge-helper-fix
+++ a/include/linux/rmap.h
@@ -219,9 +219,20 @@ static inline pte_t *page_check_address(
  * Used by idle page tracking to check if a page was referenced via page
  * tables.
  */
+#ifdef CONFIG_TRANSPARENT_HUGEPAGE
 bool page_check_address_transhuge(struct page *page, struct mm_struct *mm,
 				  unsigned long address, pmd_t **pmdp,
 				  pte_t **ptep, spinlock_t **ptlp);
+#else
+static inline bool page_check_address_transhuge(struct page *page,
+				struct mm_struct *mm, unsigned long address,
+				pmd_t **pmdp, pte_t **ptep, spinlock_t **ptlp)
+{
+	*ptep = page_check_address(page, mm, address, ptlp, 0);
+	*pmdp = NULL;
+	return !!*ptep;
+}
+#endif
 
 /*
  * Used by swapoff to help locate where page is expected in vma.
diff -puN mm/rmap.c~mm-add-page_check_address_transhuge-helper-fix mm/rmap.c
--- a/mm/rmap.c~mm-add-page_check_address_transhuge-helper-fix
+++ a/mm/rmap.c
@@ -798,6 +798,7 @@ int page_mapped_in_vma(struct page *page
 	return 1;
 }
 
+#ifdef CONFIG_TRANSPARENT_HUGEPAGE
 /*
  * Check that @page is mapped at @address into @mm. In contrast to
  * page_check_address(), this function can handle transparent huge pages.
@@ -885,6 +886,7 @@ found:
 	*ptlp = ptl;
 	return true;
 }
+#endif /* CONFIG_TRANSPARENT_HUGEPAGE */
 
 struct page_referenced_arg {
 	int mapcount;
_

Patches currently in -mm which might be from vdavydov@virtuozzo.com are

revert-kernfs-do-not-account-ino_ida-allocations-to-memcg.patch
revert-gfp-add-__gfp_noaccount.patch
memcg-only-account-kmem-allocations-marked-as-__gfp_account.patch
slab-add-slab_account-flag.patch
vmalloc-allow-to-account-vmalloc-to-memcg.patch
account-certain-kmem-allocations-to-memcg.patch
vmscan-do-not-force-scan-file-lru-if-its-absolute-size-is-small.patch
memcg-do-not-allow-to-disable-tcp-accounting-after-limit-is-set.patch
mm-add-page_check_address_transhuge-helper.patch