summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-08-22 09:13:06 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-08-29 09:47:39 -0700
commitbd4b69c1f7f58fc28fb636a3be006770edf58d68 (patch)
tree982ae0cb3049d76520cdf6f2f7172dda836fb6cc /include/linux
parent32b8d5f874e1c6ca88ec4f2d10cd885b3d70cf17 (diff)
downloadlinux-3.10-bd4b69c1f7f58fc28fb636a3be006770edf58d68.tar.gz
linux-3.10-bd4b69c1f7f58fc28fb636a3be006770edf58d68.tar.bz2
linux-3.10-bd4b69c1f7f58fc28fb636a3be006770edf58d68.zip
Revert "x86 get_unmapped_area(): use proper mmap base for bottom-up direction"
commit 5ea80f76a56605a190a7ea16846c82aa63dbd0aa upstream. This reverts commit df54d6fa54275ce59660453e29d1228c2b45a826. The commit isn't necessarily wrong, but because it recalculates the random mmap_base every time, it seems to confuse user memory allocators that expect contiguous mmap allocations even when the mmap address isn't specified. In particular, the MATLAB Java runtime seems to be unhappy. See https://bugzilla.kernel.org/show_bug.cgi?id=60774 So we'll want to apply the random offset only once, and Radu has a patch for that. Revert this older commit in order to apply the other one. Reported-by: Jeff Shorey <shoreyjeff@gmail.com> Cc: Radu Caragea <sinaelgl@gmail.com> Cc: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/sched.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/sched.h b/include/linux/sched.h
index 3aeb14b0624..178a8d909f1 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -314,7 +314,6 @@ struct nsproxy;
struct user_namespace;
#ifdef CONFIG_MMU
-extern unsigned long mmap_legacy_base(void);
extern void arch_pick_mmap_layout(struct mm_struct *mm);
extern unsigned long
arch_get_unmapped_area(struct file *, unsigned long, unsigned long,