From 479843948bd817213dacf760a6d28bb96a180ef8 Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Wed, 30 Jan 2008 13:30:25 +0100
Subject: [PATCH] --- yaml --- r: 79769 b: refs/heads/master c:
 f8eeae682166e3b965dcdaf499932f4b63cc5b5d h: refs/heads/master i:   79767:
 1cc0dae1a0273ed66eb95ce28a0072b5867f193d v: v3

---
 [refs]                      |  2 +-
 trunk/arch/x86/mm/mmap_32.c |  4 ++--
 trunk/arch/x86/mm/mmap_64.c | 11 +++++++----
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 99959bccb5d2..37b4904b144a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ed4aed98da8d042716d327a0b538dd8002c0a767
+refs/heads/master: f8eeae682166e3b965dcdaf499932f4b63cc5b5d
diff --git a/trunk/arch/x86/mm/mmap_32.c b/trunk/arch/x86/mm/mmap_32.c
index 552e08473755..d7dd0962a6d7 100644
--- a/trunk/arch/x86/mm/mmap_32.c
+++ b/trunk/arch/x86/mm/mmap_32.c
@@ -64,8 +64,8 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
 	 * bit is set, or if the expected stack growth is unlimited:
 	 */
 	if (sysctl_legacy_va_layout ||
-			(current->personality & ADDR_COMPAT_LAYOUT) ||
-			current->signal->rlim[RLIMIT_STACK].rlim_cur == RLIM_INFINITY) {
+	    (current->personality & ADDR_COMPAT_LAYOUT) ||
+	    current->signal->rlim[RLIMIT_STACK].rlim_cur == RLIM_INFINITY) {
 		mm->mmap_base = TASK_UNMAPPED_BASE;
 		mm->get_unmapped_area = arch_get_unmapped_area;
 		mm->unmap_area = arch_unmap_area;
diff --git a/trunk/arch/x86/mm/mmap_64.c b/trunk/arch/x86/mm/mmap_64.c
index 80bba0dc000e..ffb71a31bb6e 100644
--- a/trunk/arch/x86/mm/mmap_64.c
+++ b/trunk/arch/x86/mm/mmap_64.c
@@ -16,11 +16,14 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
 #endif
 	mm->mmap_base = TASK_UNMAPPED_BASE;
 	if (current->flags & PF_RANDOMIZE) {
-		/* Add 28bit randomness which is about 40bits of address space
-		   because mmap base has to be page aligned.
- 		   or ~1/128 of the total user VM
-	   	   (total user address space is 47bits) */
+		/*
+		 * Add 28bit randomness which is about 40bits of
+		 * address space because mmap base has to be page
+		 * aligned.  or ~1/128 of the total user VM (total
+		 * user address space is 47bits)
+		 */
 		unsigned rnd = get_random_int() & 0xfffffff;
+
 		mm->mmap_base += ((unsigned long)rnd) << PAGE_SHIFT;
 	}
 	mm->get_unmapped_area = arch_get_unmapped_area;