The patch titled get_unmapped_area handles MAP_FIXED on sparc64 has been added to the -mm tree. Its filename is get_unmapped_area-handles-map_fixed-on-sparc64.patch *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: get_unmapped_area handles MAP_FIXED on sparc64 From: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx> Handle MAP_FIXED in hugetlb_get_unmapped_area on sparc64 by just using prepare_hugepage_range() Signed-off-by: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx> Acked-by: William Irwin <bill.irwin@xxxxxxxxxx> Cc: "David S. Miller" <davem@xxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- arch/sparc64/mm/hugetlbpage.c | 6 ++++++ 1 file changed, 6 insertions(+) diff -puN arch/sparc64/mm/hugetlbpage.c~get_unmapped_area-handles-map_fixed-on-sparc64 arch/sparc64/mm/hugetlbpage.c --- a/arch/sparc64/mm/hugetlbpage.c~get_unmapped_area-handles-map_fixed-on-sparc64 +++ a/arch/sparc64/mm/hugetlbpage.c @@ -175,6 +175,12 @@ hugetlb_get_unmapped_area(struct file *f if (len > task_size) return -ENOMEM; + if (flags & MAP_FIXED) { + if (prepare_hugepage_range(addr, len, pgoff)) + return -EINVAL; + return addr; + } + if (addr) { addr = ALIGN(addr, HPAGE_SIZE); vma = find_vma(mm, addr); _ Patches currently in -mm which might be from benh@xxxxxxxxxxxxxxxxxxx are git-powerpc.patch git-powerpc-arch-powerpc-sysdev-timerc-build-fix.patch ppc4xx_sgdma-needs-dma_mappingh.patch powerpc-rtas-msi-support.patch spin_lock_unlocked-cleanup-in-arch-powerpc.patch macintosh-mediabay-convert-to-kthread-api.patch macintosh-adb-convert-to-the-kthread-api.patch macintosh-therm_pm72c-partially-convert-to-kthread-api.patch s2ram-add-arch-irq-disable-enable-hooks.patch fix-jdelvare-i2c-i2c-del-driver-returns-void-on-powerpc.patch slub-core.patch use-slab_panic-flag-cleanup.patch get_unmapped_area-handles-map_fixed-on-powerpc.patch get_unmapped_area-handles-map_fixed-on-alpha.patch get_unmapped_area-handles-map_fixed-on-arm.patch get_unmapped_area-handles-map_fixed-on-frv.patch get_unmapped_area-handles-map_fixed-on-i386.patch get_unmapped_area-handles-map_fixed-on-ia64.patch get_unmapped_area-handles-map_fixed-on-parisc.patch get_unmapped_area-handles-map_fixed-on-sparc64.patch get_unmapped_area-handles-map_fixed-on-x86_64.patch get_unmapped_area-handles-map_fixed-in-hugetlbfs.patch get_unmapped_area-handles-map_fixed-in-generic-code.patch get_unmapped_area-doesnt-need-hugetlbfs-hacks-anymore.patch the-scheduled-removal-of-obsolete_oss-options.patch drivers-macintosh-mac_hidc-make-code-static.patch fixes-and-cleanups-for-earlyprintk-aka-boot-console.patch parport-dev-driver-model-support-powerpc-fix.patch atomich-add-atomic64-cmpxchg-xchg-and-add_unless-to-powerpc.patch atomich-add-atomic64-cmpxchg-xchg-and-add_unless-to-powerpc-fix.patch local_t-powerpc-extension.patch linux-kernel-markers-powerpc-optimization.patch ps3fb-thread-updates.patch ps3av-thread-updates.patch ps3fb-kill-superfluous-zero-initializations.patch ps3av-misc-updates.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