On Fri, 25 Jul 2008 12:27:48 +0300 Adrian Bunk <bunk@xxxxxxxxxx> wrote: > Further testing revealed that you should choose a file that also gets > compiled on MMU-less architectures: We don't have one :( I guess util.c will have to do. 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> @@ -160,3 +161,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 _ We should make arch_pick_mmap_layout __weak and nuke that ifdef. -- To unsubscribe from this list: send the line "unsubscribe linux-arch" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html