The patch titled Subject: memcg-add-hugetlb-extension-fix has been removed from the -mm tree. Its filename was memcg-add-hugetlb-extension-fix.patch This patch was dropped because an updated version will be merged The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ From: David Rientjes <rientjes@xxxxxxxxxx> Subject: memcg-add-hugetlb-extension-fix Fix UML build: mm/memcontrol.c:256:30: error: 'HUGE_MAX_HSTATE' undeclared here (not in a function) Cc: Aneesh Kumar K.V <aneesh.kumar@xxxxxxxxxxxxxxxxxx> Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@xxxxxxxxxxxxxx> Cc: Hillf Danton <dhillf@xxxxxxxxx> Cc: Michal Hocko <mhocko@xxxxxxx> Cc: Andrea Arcangeli <aarcange@xxxxxxxxxx> Cc: Johannes Weiner <hannes@xxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- arch/powerpc/include/asm/page.h | 2 +- arch/tile/include/asm/page.h | 3 +-- arch/x86/include/asm/page_types.h | 2 ++ include/linux/hugetlb.h | 1 + 4 files changed, 5 insertions(+), 3 deletions(-) diff -puN arch/powerpc/include/asm/page.h~memcg-add-hugetlb-extension-fix arch/powerpc/include/asm/page.h --- a/arch/powerpc/include/asm/page.h~memcg-add-hugetlb-extension-fix +++ a/arch/powerpc/include/asm/page.h @@ -39,13 +39,13 @@ #ifndef __ASSEMBLY__ #ifdef CONFIG_HUGETLB_PAGE extern unsigned int HPAGE_SHIFT; +#define HUGE_MAX_HSTATE (MMU_PAGE_COUNT-1) #else #define HPAGE_SHIFT PAGE_SHIFT #endif #define HPAGE_SIZE ((1UL) << HPAGE_SHIFT) #define HPAGE_MASK (~(HPAGE_SIZE - 1)) #define HUGETLB_PAGE_ORDER (HPAGE_SHIFT - PAGE_SHIFT) -#define HUGE_MAX_HSTATE (MMU_PAGE_COUNT-1) #endif /* We do define AT_SYSINFO_EHDR but don't use the gate mechanism */ diff -puN arch/tile/include/asm/page.h~memcg-add-hugetlb-extension-fix arch/tile/include/asm/page.h --- a/arch/tile/include/asm/page.h~memcg-add-hugetlb-extension-fix +++ a/arch/tile/include/asm/page.h @@ -136,9 +136,8 @@ static inline __attribute_const__ int ge #define HUGETLB_PAGE_ORDER (HPAGE_SHIFT - PAGE_SHIFT) -#define HUGE_MAX_HSTATE 6 - #ifdef CONFIG_HUGETLB_PAGE +#define HUGE_MAX_HSTATE 6 #define HAVE_ARCH_HUGETLB_UNMAPPED_AREA #endif diff -puN arch/x86/include/asm/page_types.h~memcg-add-hugetlb-extension-fix arch/x86/include/asm/page_types.h --- a/arch/x86/include/asm/page_types.h~memcg-add-hugetlb-extension-fix +++ a/arch/x86/include/asm/page_types.h @@ -25,7 +25,9 @@ #define HPAGE_MASK (~(HPAGE_SIZE - 1)) #define HUGETLB_PAGE_ORDER (HPAGE_SHIFT - PAGE_SHIFT) +#ifdef CONFIG_HUGETLB_PAGE #define HUGE_MAX_HSTATE 2 +#endif #define PAGE_OFFSET ((unsigned long)__PAGE_OFFSET) diff -puN include/linux/hugetlb.h~memcg-add-hugetlb-extension-fix include/linux/hugetlb.h --- a/include/linux/hugetlb.h~memcg-add-hugetlb-extension-fix +++ a/include/linux/hugetlb.h @@ -322,6 +322,7 @@ static inline int hstate_index(struct hs #else struct hstate {}; +#define HUGE_MAX_HSTATE 0 #define alloc_huge_page_node(h, nid) NULL #define alloc_bootmem_huge_page(h) NULL #define hstate_file(f) NULL _ Patches currently in -mm which might be from rientjes@xxxxxxxxxx are linux-next.patch slab-move-full-state-transition-to-an-initcall.patch memcg-add-hugetlb-extension-fix-fix.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