The patch titled get_unmapped_area doesn't need hugetlbfs hacks anymore has been removed from the -mm tree. Its filename was get_unmapped_area-doesnt-need-hugetlbfs-hacks-anymore.patch This patch was dropped because it was merged into mainline or a subsystem tree ------------------------------------------------------ Subject: get_unmapped_area doesn't need hugetlbfs hacks anymore From: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx> Remove the hugetlbfs specific hacks in toplevel get_unmapped_area() now that all archs and hugetlbfs itself do the right thing for both cases. Signed-off-by: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx> Acked-by: William Irwin <bill.irwin@xxxxxxxxxx> Cc: Paul Mackerras <paulus@xxxxxxxxx> Cc: Richard Henderson <rth@xxxxxxxxxxx> Cc: Ivan Kokshaysky <ink@xxxxxxxxxxxxxxxxxxxx> Cc: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx> Cc: David Howells <dhowells@xxxxxxxxxx> Cc: Andi Kleen <ak@xxxxxxx> Cc: "Luck, Tony" <tony.luck@xxxxxxxxx> Cc: Kyle McMartin <kyle@xxxxxxxxxxx> Cc: Grant Grundler <grundler@xxxxxxxxxxxxxxxx> Cc: Matthew Wilcox <willy@xxxxxxxxxx> Cc: "David S. Miller" <davem@xxxxxxxxxxxxx> Cc: Adam Litke <agl@xxxxxxxxxx> Cc: David Gibson <david@xxxxxxxxxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- mm/mmap.c | 16 ---------------- 1 file changed, 16 deletions(-) diff -puN mm/mmap.c~get_unmapped_area-doesnt-need-hugetlbfs-hacks-anymore mm/mmap.c --- a/mm/mmap.c~get_unmapped_area-doesnt-need-hugetlbfs-hacks-anymore +++ a/mm/mmap.c @@ -1382,22 +1382,6 @@ get_unmapped_area(struct file *file, uns if (addr & ~PAGE_MASK) return -EINVAL; - if (file && is_file_hugepages(file)) { - /* - * Check if the given range is hugepage aligned, and - * can be made suitable for hugepages. - */ - ret = prepare_hugepage_range(addr, len, pgoff); - } else { - /* - * Ensure that a normal request is not falling in a - * reserved hugepage range. For some archs like IA-64, - * there is a separate region for hugepages. - */ - ret = is_hugepage_only_range(current->mm, addr, len); - } - if (ret) - return -EINVAL; return addr; } _ Patches currently in -mm which might be from benh@xxxxxxxxxxxxxxxxxxx are origin.patch git-powerpc.patch gregkh-driver-remove-struct-subsystem-as-it-is-no-longer-needed-powerpc-fixes.patch use-slab_panic-flag-cleanup.patch the-scheduled-removal-of-obsolete_oss-options.patch fixes-and-cleanups-for-earlyprintk-aka-boot-console.patch parport-dev-driver-model-support.patch introduce-freezer-flags-rev-2.patch atomich-add-atomic64-cmpxchg-xchg-and-add_unless-to-powerpc.patch local_t-powerpc-extension.patch linux-kernel-markers-powerpc-optimization.patch aty128fb-fix-blanking.patch radeonfb-add-support-for-radeon-xpress-200m.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