The patch titled Subject: mm-change-vunmap-to-tear-down-huge-kva-mappings-fix has been removed from the -mm tree. Its filename was mm-change-vunmap-to-tear-down-huge-kva-mappings-fix.patch This patch was dropped because it was folded into mm-change-vunmap-to-tear-down-huge-kva-mappings.patch ------------------------------------------------------ From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> Subject: mm-change-vunmap-to-tear-down-huge-kva-mappings-fix use consistent code layout Cc: Toshi Kani <toshi.kani@xxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- include/asm-generic/pgtable.h | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff -puN include/asm-generic/pgtable.h~mm-change-vunmap-to-tear-down-huge-kva-mappings-fix include/asm-generic/pgtable.h --- a/include/asm-generic/pgtable.h~mm-change-vunmap-to-tear-down-huge-kva-mappings-fix +++ a/include/asm-generic/pgtable.h @@ -711,8 +711,14 @@ static inline int pmd_set_huge(pmd_t *pm { return 0; } -static inline int pud_clear_huge(pud_t *pud) { return 0; } -static inline int pmd_clear_huge(pmd_t *pmd) { return 0; } +static inline int pud_clear_huge(pud_t *pud) +{ + return 0; +} +static inline int pmd_clear_huge(pmd_t *pmd) +{ + return 0; +} #endif /* CONFIG_HAVE_ARCH_HUGE_VMAP */ #endif /* !__ASSEMBLY__ */ _ Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are origin.patch ocfs2-make-mlog_errno-return-the-errno.patch mm-migrate-mark-unmap_and_move-noinline-to-avoid-ice-in-gcc-473.patch mm-cma-release-trigger.patch mm-cma-allocation-trigger-fix.patch mm-compaction-enhance-compaction-finish-condition.patch page_writeback-cleanup-mess-around-cancel_dirty_page.patch mm-hide-per-cpu-lists-in-output-of-show_mem.patch mm-clarify-__gfp_nofail-deprecation-status.patch mm-change-vunmap-to-tear-down-huge-kva-mappings.patch mm-mempool-do-not-allow-atomic-resizing-checkpatch-fixes.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