The patch titled
Subject: smaps-should-deal-with-huge-zero-page-exactly-same-as-normal-zero-page-fix
has been removed from the -mm tree. Its filename was
smaps-should-deal-with-huge-zero-page-exactly-same-as-normal-zero-page-fix.patch
This patch was dropped because an alternative patch was merged
------------------------------------------------------
From: Fengwei Yin <yfw.kernel@xxxxxxxxx>
Subject: smaps-should-deal-with-huge-zero-page-exactly-same-as-normal-zero-page-fix
fix build with/without CONFIG_TRANSPARENT_HUGEPAGE
Signed-off-by: Fengwei Yin <yfw.kernel@xxxxxxxxx>
Cc: Fengguang Wu <fengguang.wu@xxxxxxxxx>
Cc: Dave Hansen <dave.hansen@xxxxxxxxx>
Cc: Naoya Horiguchi <n-horiguchi@xxxxxxxxxxxxx>
Cc: "Kirill A. Shutemov" <kirill@xxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
include/linux/huge_mm.h | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff -puN include/linux/huge_mm.h~smaps-should-deal-with-huge-zero-page-exactly-same-as-normal-zero-page-fix include/linux/huge_mm.h
--- a/include/linux/huge_mm.h~smaps-should-deal-with-huge-zero-page-exactly-same-as-normal-zero-page-fix
+++ a/include/linux/huge_mm.h
@@ -34,8 +34,6 @@ extern int change_huge_pmd(struct vm_are
unsigned long addr, pgprot_t newprot,
int prot_numa);
-extern bool is_huge_zero_pfn(unsigned long pfn);
-
enum transparent_hugepage_flag {
TRANSPARENT_HUGEPAGE_FLAG,
TRANSPARENT_HUGEPAGE_REQ_MADV_FLAG,
@@ -159,6 +157,8 @@ static inline int hpage_nr_pages(struct
extern int do_huge_pmd_numa_page(struct mm_struct *mm, struct vm_area_struct *vma,
unsigned long addr, pmd_t pmd, pmd_t *pmdp);
+extern bool is_huge_zero_pfn(unsigned long pfn);
+
#else /* CONFIG_TRANSPARENT_HUGEPAGE */
#define HPAGE_PMD_SHIFT ({ BUILD_BUG(); 0; })
#define HPAGE_PMD_MASK ({ BUILD_BUG(); 0; })
@@ -207,6 +207,11 @@ static inline int do_huge_pmd_numa_page(
{
return 0;
}
+
+static inline bool is_huge_zero_pfn(unsigned long pfn)
+{
+ return 0;
+}
#endif /* CONFIG_TRANSPARENT_HUGEPAGE */
_
Patches currently in -mm which might be from yfw.kernel@xxxxxxxxx are
mm-fix-huge-zero-page-accounting-in-smaps-report.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
