diff options
| author | Amerigo Wang <amwang@redhat.com> | 2009-05-12 02:05:28 (GMT) |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-05-12 09:13:45 (GMT) |
| commit | 9d62dcdfa6f6fc843f7d9b494bcd48f00b94f883 (patch) | |
| tree | c319c1053b2b72b4d5eb29f87995f0e93c3ada51 /arch/x86/kernel/process_64.c | |
| parent | 087fa4e964e04371a67f340e1f6ac92c5db5e0a6 (diff) | |
| download | linux-9d62dcdfa6f6fc843f7d9b494bcd48f00b94f883.tar.xz | |
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_64.c')
| -rw-r--r-- | arch/x86/kernel/process_64.c | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/arch/x86/kernel/process_64.c b/arch/x86/kernel/process_64.c index b751a41..34386f7 100644 --- a/arch/x86/kernel/process_64.c +++ b/arch/x86/kernel/process_64.c @@ -32,7 +32,6 @@ #include <linux/delay.h> #include <linux/module.h> #include <linux/ptrace.h> -#include <linux/random.h> #include <linux/notifier.h> #include <linux/kprobes.h> #include <linux/kdebug.h> @@ -660,15 +659,3 @@ long sys_arch_prctl(int code, unsigned long addr) return do_arch_prctl(current, code, addr); } -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; -} |