aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2008-01-30 07:30:25 -0500
committerIngo Molnar <mingo@elte.hu>2008-01-30 07:30:25 -0500
commitf8eeae682166e3b965dcdaf499932f4b63cc5b5d (patch)
treed4d1afb2a4604bc2ade01dcae086ec27776b148c /arch
parented4aed98da8d042716d327a0b538dd8002c0a767 (diff)
x86: clean up arch/x86/mm/mmap_32/64.c
White space and coding style clenaup. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/mm/mmap_32.c4
-rw-r--r--arch/x86/mm/mmap_64.c11
2 files changed, 9 insertions, 6 deletions
diff --git a/arch/x86/mm/mmap_32.c b/arch/x86/mm/mmap_32.c
index 552e08473755..d7dd0962a6d7 100644
--- a/arch/x86/mm/mmap_32.c
+++ b/arch/x86/mm/mmap_32.c
@@ -64,8 +64,8 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
64 * bit is set, or if the expected stack growth is unlimited: 64 * bit is set, or if the expected stack growth is unlimited:
65 */ 65 */
66 if (sysctl_legacy_va_layout || 66 if (sysctl_legacy_va_layout ||
67 (current->personality & ADDR_COMPAT_LAYOUT) || 67 (current->personality & ADDR_COMPAT_LAYOUT) ||
68 current->signal->rlim[RLIMIT_STACK].rlim_cur == RLIM_INFINITY) { 68 current->signal->rlim[RLIMIT_STACK].rlim_cur == RLIM_INFINITY) {
69 mm->mmap_base = TASK_UNMAPPED_BASE; 69 mm->mmap_base = TASK_UNMAPPED_BASE;
70 mm->get_unmapped_area = arch_get_unmapped_area; 70 mm->get_unmapped_area = arch_get_unmapped_area;
71 mm->unmap_area = arch_unmap_area; 71 mm->unmap_area = arch_unmap_area;
diff --git a/arch/x86/mm/mmap_64.c b/arch/x86/mm/mmap_64.c
index 80bba0dc000e..ffb71a31bb6e 100644
--- a/arch/x86/mm/mmap_64.c
+++ b/arch/x86/mm/mmap_64.c
@@ -16,11 +16,14 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
16#endif 16#endif
17 mm->mmap_base = TASK_UNMAPPED_BASE; 17 mm->mmap_base = TASK_UNMAPPED_BASE;
18 if (current->flags & PF_RANDOMIZE) { 18 if (current->flags & PF_RANDOMIZE) {
19 /* Add 28bit randomness which is about 40bits of address space 19 /*
20 because mmap base has to be page aligned. 20 * Add 28bit randomness which is about 40bits of
21 or ~1/128 of the total user VM 21 * address space because mmap base has to be page
22 (total user address space is 47bits) */ 22 * aligned. or ~1/128 of the total user VM (total
23 * user address space is 47bits)
24 */
23 unsigned rnd = get_random_int() & 0xfffffff; 25 unsigned rnd = get_random_int() & 0xfffffff;
26
24 mm->mmap_base += ((unsigned long)rnd) << PAGE_SHIFT; 27 mm->mmap_base += ((unsigned long)rnd) << PAGE_SHIFT;
25 } 28 }
26 mm->get_unmapped_area = arch_get_unmapped_area; 29 mm->get_unmapped_area = arch_get_unmapped_area;