diff options
author | Amerigo Wang <amwang@redhat.com> | 2009-05-11 22:05:28 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-05-12 11:13:45 +0200 |
commit | 9d62dcdfa6f6fc843f7d9b494bcd48f00b94f883 (patch) | |
tree | c319c1053b2b72b4d5eb29f87995f0e93c3ada51 /arch/x86/kernel/process.c | |
parent | 087fa4e964e04371a67f340e1f6ac92c5db5e0a6 (diff) | |
download | op-kernel-dev-9d62dcdfa6f6fc843f7d9b494bcd48f00b94f883.zip op-kernel-dev-9d62dcdfa6f6fc843f7d9b494bcd48f00b94f883.tar.gz |
x86: merge process.c a bit
Merge arch_align_stack() and arch_randomize_brk(), since
they are the same.
Tested on x86_64.
[ Impact: cleanup ]
Signed-off-by: Amerigo Wang <amwang@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/process.c')
-rw-r--r-- | arch/x86/kernel/process.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/arch/x86/kernel/process.c b/arch/x86/kernel/process.c index ca98915..2b9a8d0 100644 --- a/arch/x86/kernel/process.c +++ b/arch/x86/kernel/process.c @@ -8,6 +8,7 @@ #include <linux/module.h> #include <linux/pm.h> #include <linux/clockchips.h> +#include <linux/random.h> #include <trace/power.h> #include <asm/system.h> #include <asm/apic.h> @@ -613,3 +614,16 @@ static int __init idle_setup(char *str) } early_param("idle", idle_setup); +unsigned long arch_align_stack(unsigned long sp) +{ + if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space) + sp -= get_random_int() % 8192; + return sp & ~0xf; +} + +unsigned long arch_randomize_brk(struct mm_struct *mm) +{ + unsigned long range_end = mm->brk + 0x02000000; + return randomize_range(mm->brk, range_end, 0) ? : mm->brk; +} + |