aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorAndrew Morton <akpm@linux-foundation.org>2008-01-30 07:31:07 -0500
committerIngo Molnar <mingo@elte.hu>2008-01-30 07:31:07 -0500
commit954683a2c19696114894384e34f858bb9f455b11 (patch)
treef2688b4bfbcd121e69d745fd4092fbdd585b93b6 /arch
parentbb1ad8205be4cb95e3286d7442596da6fd70409f (diff)
x86: PIE executable randomization, uninlining
Cc: "Luck, Tony" <tony.luck@intel.com> Cc: Arjan van de Ven <arjan@infradead.org> Cc: Jakub Jelinek <jakub@redhat.com> Cc: Jiri Kosina <jkosina@suse.cz> Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com> Cc: Roland McGrath <roland@redhat.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/mm/mmap_64.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/mm/mmap_64.c b/arch/x86/mm/mmap_64.c
index 65b34f226f14..119bf34ec529 100644
--- a/arch/x86/mm/mmap_64.c
+++ b/arch/x86/mm/mmap_64.c
@@ -42,7 +42,7 @@
42#define MIN_GAP (128*1024*1024) 42#define MIN_GAP (128*1024*1024)
43#define MAX_GAP (TASK_SIZE/6*5) 43#define MAX_GAP (TASK_SIZE/6*5)
44 44
45static inline unsigned long mmap_base(void) 45static unsigned long mmap_base(void)
46{ 46{
47 unsigned long gap = current->signal->rlim[RLIMIT_STACK].rlim_cur; 47 unsigned long gap = current->signal->rlim[RLIMIT_STACK].rlim_cur;
48 48
@@ -54,7 +54,7 @@ static inline unsigned long mmap_base(void)
54 return TASK_SIZE - (gap & PAGE_MASK); 54 return TASK_SIZE - (gap & PAGE_MASK);
55} 55}
56 56
57static inline int mmap_is_32(void) 57static int mmap_is_32(void)
58{ 58{
59#ifdef CONFIG_IA32_EMULATION 59#ifdef CONFIG_IA32_EMULATION
60 if (test_thread_flag(TIF_IA32)) 60 if (test_thread_flag(TIF_IA32))
@@ -63,7 +63,7 @@ static inline int mmap_is_32(void)
63 return 0; 63 return 0;
64} 64}
65 65
66static inline int mmap_is_legacy(void) 66static int mmap_is_legacy(void)
67{ 67{
68 if (current->personality & ADDR_COMPAT_LAYOUT) 68 if (current->personality & ADDR_COMPAT_LAYOUT)
69 return 1; 69 return 1;