git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'x86-geode-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[pandora-kernel.git]
/
arch
/
x86
/
mm
/
mmap.c
diff --git
a/arch/x86/mm/mmap.c
b/arch/x86/mm/mmap.c
index
c8191de
..
4b5ba85
100644
(file)
--- a/
arch/x86/mm/mmap.c
+++ b/
arch/x86/mm/mmap.c
@@
-31,6
+31,10
@@
#include <linux/sched.h>
#include <asm/elf.h>
#include <linux/sched.h>
#include <asm/elf.h>
+struct __read_mostly va_alignment va_align = {
+ .flags = -1,
+};
+
static unsigned int stack_maxrandom_size(void)
{
unsigned int max = 0;
static unsigned int stack_maxrandom_size(void)
{
unsigned int max = 0;
@@
-42,7
+46,6
@@
static unsigned int stack_maxrandom_size(void)
return max;
}
return max;
}
-
/*
* Top of mmap area (just below the process stack).
*
/*
* Top of mmap area (just below the process stack).
*
@@
-51,27
+54,12
@@
static unsigned int stack_maxrandom_size(void)
#define MIN_GAP (128*1024*1024UL + stack_maxrandom_size())
#define MAX_GAP (TASK_SIZE/6*5)
#define MIN_GAP (128*1024*1024UL + stack_maxrandom_size())
#define MAX_GAP (TASK_SIZE/6*5)
-/*
- * True on X86_32 or when emulating IA32 on X86_64
- */
-static int mmap_is_ia32(void)
-{
-#ifdef CONFIG_X86_32
- return 1;
-#endif
-#ifdef CONFIG_IA32_EMULATION
- if (test_thread_flag(TIF_IA32))
- return 1;
-#endif
- return 0;
-}
-
static int mmap_is_legacy(void)
{
if (current->personality & ADDR_COMPAT_LAYOUT)
return 1;
static int mmap_is_legacy(void)
{
if (current->personality & ADDR_COMPAT_LAYOUT)
return 1;
- if (
current->signal->rlim[RLIMIT_STACK].rlim_cur
== RLIM_INFINITY)
+ if (
rlimit(RLIMIT_STACK)
== RLIM_INFINITY)
return 1;
return sysctl_legacy_va_layout;
return 1;
return sysctl_legacy_va_layout;
@@
-96,7
+84,7
@@
static unsigned long mmap_rnd(void)
static unsigned long mmap_base(void)
{
static unsigned long mmap_base(void)
{
- unsigned long gap =
current->signal->rlim[RLIMIT_STACK].rlim_cur
;
+ unsigned long gap =
rlimit(RLIMIT_STACK)
;
if (gap < MIN_GAP)
gap = MIN_GAP;
if (gap < MIN_GAP)
gap = MIN_GAP;