From 954683a2c19696114894384e34f858bb9f455b11 Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Wed, 30 Jan 2008 13:31:07 +0100 Subject: [PATCH] x86: PIE executable randomization, uninlining Cc: "Luck, Tony" Cc: Arjan van de Ven Cc: Jakub Jelinek Cc: Jiri Kosina Cc: KAMEZAWA Hiroyuki Cc: Roland McGrath Signed-off-by: Andrew Morton Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner --- arch/x86/mm/mmap_64.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/x86/mm/mmap_64.c b/arch/x86/mm/mmap_64.c index 65b34f226f1..119bf34ec52 100644 --- a/arch/x86/mm/mmap_64.c +++ b/arch/x86/mm/mmap_64.c @@ -42,7 +42,7 @@ #define MIN_GAP (128*1024*1024) #define MAX_GAP (TASK_SIZE/6*5) -static inline unsigned long mmap_base(void) +static unsigned long mmap_base(void) { unsigned long gap = current->signal->rlim[RLIMIT_STACK].rlim_cur; @@ -54,7 +54,7 @@ static inline unsigned long mmap_base(void) return TASK_SIZE - (gap & PAGE_MASK); } -static inline int mmap_is_32(void) +static int mmap_is_32(void) { #ifdef CONFIG_IA32_EMULATION if (test_thread_flag(TIF_IA32)) @@ -63,7 +63,7 @@ static inline int mmap_is_32(void) return 0; } -static inline int mmap_is_legacy(void) +static int mmap_is_legacy(void) { if (current->personality & ADDR_COMPAT_LAYOUT) return 1; -- 2.20.1