This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / arch / i386 / mm / mmap.c

diff --git a/arch/i386/mm/mmap.c b/arch/i386/mm/mmap.c
index 09a693d..ec60c0b 100644 (file)
--- a/arch/i386/mm/mmap.c
+++ b/arch/i386/mm/mmap.c
@@ -26,7 +26,6 @@
 
 #include <linux/personality.h>
 #include <linux/mm.h>
-#include <linux/random.h>
 
 /*
  * Top of mmap area (just below the process stack).
@@ -38,18 +37,14 @@
 
 static inline unsigned long mmap_base(struct mm_struct *mm)
 {
-       unsigned long gap = current->signal->rlim[RLIMIT_STACK].rlim_cur;
-       unsigned long random_factor = 0;
-
-       if (current->flags & PF_RELOCEXEC)
-               random_factor = get_random_int() % (1024*1024);
+       unsigned long gap = current->rlim[RLIMIT_STACK].rlim_cur;
 
        if (gap < MIN_GAP)
                gap = MIN_GAP;
        else if (gap > MAX_GAP)
                gap = MAX_GAP;
 
-       return PAGE_ALIGN(TASK_SIZE - gap - random_factor);
+       return TASK_SIZE - (gap & PAGE_MASK);
 }
 
 /*
@@ -62,9 +57,9 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
         * Fall back to the standard layout if the personality
         * bit is set, or if the expected stack growth is unlimited:
         */
-       if ((exec_shield != 2) && (sysctl_legacy_va_layout ||
+       if (sysctl_legacy_va_layout ||
                        (current->personality & ADDR_COMPAT_LAYOUT) ||
-                       current->signal->rlim[RLIMIT_STACK].rlim_cur == RLIM_INFINITY)){
+                       current->rlim[RLIMIT_STACK].rlim_cur == RLIM_INFINITY) {
                mm->mmap_base = TASK_UNMAPPED_BASE;
                mm->get_unmapped_area = arch_get_unmapped_area;
                mm->unmap_area = arch_unmap_area;