The patch titled uninline arch_pick_mmap_layout() has been removed from the -mm tree. Its filename was uninline-arch_pick_mmap_layout.patch This patch was dropped because it was merged into mainline or a subsystem tree The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: uninline arch_pick_mmap_layout() From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> Fix this, on avr32: /home/bunk/linux/kernel-2.6/git/linux-2.6/include/linux/utsname.h:35, from /home/bunk/linux/kernel-2.6/git/linux-2.6/init/main.c:20: /home/bunk/linux/kernel-2.6/git/linux-2.6/include/linux/sched.h: In function 'arch_pick_mmap_layout': /home/bunk/linux/kernel-2.6/git/linux-2.6/include/linux/sched.h:2149: error: implicit declaration of function 'PAGE_ALIGN' Reported-by: Adrian Bunk <bunk@xxxxxxxxxx> Cc: Haavard Skinnemoen <hskinnemoen@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- include/linux/sched.h | 9 --------- mm/util.c | 10 ++++++++++ 2 files changed, 10 insertions(+), 9 deletions(-) diff -puN include/linux/sched.h~uninline-arch_pick_mmap_layout include/linux/sched.h --- a/include/linux/sched.h~uninline-arch_pick_mmap_layout +++ a/include/linux/sched.h @@ -2139,16 +2139,7 @@ static inline void set_task_cpu(struct t #endif /* CONFIG_SMP */ -#ifdef HAVE_ARCH_PICK_MMAP_LAYOUT extern void arch_pick_mmap_layout(struct mm_struct *mm); -#else -static inline void arch_pick_mmap_layout(struct mm_struct *mm) -{ - mm->mmap_base = TASK_UNMAPPED_BASE; - mm->get_unmapped_area = arch_get_unmapped_area; - mm->unmap_area = arch_unmap_area; -} -#endif #ifdef CONFIG_TRACING extern void diff -puN mm/util.c~uninline-arch_pick_mmap_layout mm/util.c --- a/mm/util.c~uninline-arch_pick_mmap_layout +++ a/mm/util.c @@ -1,3 +1,4 @@ +#include <linux/mm.h> #include <linux/slab.h> #include <linux/string.h> #include <linux/module.h> @@ -136,3 +137,12 @@ char *strndup_user(const char __user *s, return p; } EXPORT_SYMBOL(strndup_user); + +#ifndef HAVE_ARCH_PICK_MMAP_LAYOUT +void arch_pick_mmap_layout(struct mm_struct *mm) +{ + mm->mmap_base = TASK_UNMAPPED_BASE; + mm->get_unmapped_area = arch_get_unmapped_area; + mm->unmap_area = arch_unmap_area; +} +#endif _ Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are origin.patch hugetlb-remove-unused-variable-warning-checkpatch-fixes.patch seq_file-fix-bug-when-seq_read-reads-nothing.patch linux-next.patch linux-next-fixups.patch linux-next-rejects.patch next-remove-localversion.patch drivers-mtd-nand-nandsimc-needs-div64h.patch pci-make-pci_register_driver-a-macro.patch x86-pci-replace-dbg-with-pr_debug-fix.patch x86-pci-replace-dbg-with-pr_debug-fix-2.patch include-asm-generic-pgtable-nopmdh-macros-are-noxious-reason-435.patch arch-x86-pci-i386c-fix-printk-warnings.patch drm-fix-sparc64-build.patch i2c-renesas-highlander-fpga-smbus-support.patch tick-schedc-suppress-needless-timer-reprogramming.patch git-jg-misc.patch documentation-build-source-files-in-documentation-sub-dir-disable.patch git-ubi-git-rejects.patch bridge-send-correct-mtu-value-in-pmtu-checkpatch-fixes.patch sundance-set-carrier-status-on-link-change-events.patch update-smc91x-driver-with-arm-versatile-board-info.patch drivers-scsi-qla2xxx-qla_osc-suppress-uninitialized-var-warning.patch scsi-gdthc-use-unaligned-access-helpers-checkpatch-fixes.patch git-block-git-rejects.patch git-unionfs.patch git-logfs-git-rejects.patch git-logfs-fixup.patch drivers-usb-class-cdc-acmc-use-correct-type-for-cpu-flags.patch drivers-usb-class-cdc-wdmc-fix-build-with-config_pm=n.patch drivers-net-wireless-iwlwifi-iwl-ledc-printk-fix.patch git-xtensa.patch scsi-dpt_i2o-is-bust-on-ia64.patch ftrace-disable-function-tracing-bringing-up-new-cpu-fix.patch mmu-notifiers-add-mm_take_all_locks-operation.patch mmu-notifier-core.patch vmscan-give-referenced-active-and-unmapped-pages-a-second-trip-around-the-lru.patch vm-dont-run-touch_buffer-during-buffercache-lookups.patch eink_apollofb-new-driver-for-apollo-eink-controller.patch getdelaysc-add-a-usr1-signal-handler-checkpatch-fixes.patch ppc-use-the-common-ascii-hex-helpers-fix.patch gru-driver-v3-hardware-data-structures-fix.patch gru-driver-v3-hardware-data-structures-fix-fix.patch gcov-architecture-specific-compile-flag-adjustments-powerpc-moved-stuff.patch vmscan-move-isolate_lru_page-to-vmscanc-fix.patch define-page_file_cache-function-fix.patch vmscan-split-lru-lists-into-anon-file-sets-units-fix.patch unevictable-lru-infrastructure-fix.patch unevictable-lru-page-statistics-units-fix.patch mlock-mlocked-pages-are-unevictable-fix.patch mlock-mlocked-pages-are-unevictable-fix-fix.patch mlock-mlocked-pages-are-unevictable-fix-3.patch mmap-handle-mlocked-pages-during-map-remap-unmap-cleanup.patch introduce-__get_user_pages-fix.patch vmscan-unevictable-lru-scan-sysctl-nommu-fix.patch slb-drop-kmem-cache-argument-from-constructor-fix-fix-logfs.patch reiser4.patch reiser4-tree_lock-fixes.patch reiser4-tree_lock-fixes-fix.patch reiser4-semaphore-fix.patch slb-drop-kmem-cache-argument-from-constructor-reiser4.patch reiser4-suid.patch page-owner-tracking-leak-detector.patch nr_blockdev_pages-in_interrupt-warning.patch slab-leaks3-default-y.patch put_bh-debug.patch shrink_slab-handle-bad-shrinkers.patch getblk-handle-2tb-devices.patch getblk-handle-2tb-devices-fix.patch undeprecate-pci_find_device.patch notify_change-callers-must-hold-i_mutex.patch profile-likely-unlikely-macros.patch drivers-net-bonding-bond_sysfsc-suppress-uninitialized-var-warning.patch w1-build-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