From a9510b6067aee6e346a8613f33f78f3b65559d63 Mon Sep 17 00:00:00 2001
From: Heiko Carstens <heiko.carstens@de.ibm.com>
Date: Wed, 12 Jan 2011 09:55:28 +0100
Subject: [PATCH] --- yaml --- r: 230971 b: refs/heads/master c:
 9887a1fcddef1386d3387edf6497d08670460edb h: refs/heads/master i:   230969:
 0793f9b3fda6fb85b60290f737814e9e55a3d9c0   230967:
 c8ac429226f86e1f9723d32df819f83323fc1c79 v: v3

---
 [refs]                               | 2 +-
 trunk/arch/s390/include/asm/system.h | 2 +-
 trunk/arch/s390/kernel/process.c     | 9 +++++++++
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index e5246cfac021..fca3f41253db 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: df1ca53cba34b1d40a4ed47907d71397e4ee72c2
+refs/heads/master: 9887a1fcddef1386d3387edf6497d08670460edb
diff --git a/trunk/arch/s390/include/asm/system.h b/trunk/arch/s390/include/asm/system.h
index 6710b0eac165..8f8d759f6a7b 100644
--- a/trunk/arch/s390/include/asm/system.h
+++ b/trunk/arch/s390/include/asm/system.h
@@ -449,7 +449,7 @@ extern void (*_machine_restart)(char *command);
 extern void (*_machine_halt)(void);
 extern void (*_machine_power_off)(void);
 
-#define arch_align_stack(x) (x)
+extern unsigned long arch_align_stack(unsigned long sp);
 
 static inline int tprot(unsigned long addr)
 {
diff --git a/trunk/arch/s390/kernel/process.c b/trunk/arch/s390/kernel/process.c
index 6ba42222b542..38ff69e562c8 100644
--- a/trunk/arch/s390/kernel/process.c
+++ b/trunk/arch/s390/kernel/process.c
@@ -30,9 +30,11 @@
 #include <linux/tick.h>
 #include <linux/elfcore.h>
 #include <linux/kernel_stat.h>
+#include <linux/personality.h>
 #include <linux/syscalls.h>
 #include <linux/compat.h>
 #include <linux/kprobes.h>
+#include <linux/random.h>
 #include <asm/compat.h>
 #include <asm/uaccess.h>
 #include <asm/pgtable.h>
@@ -332,3 +334,10 @@ unsigned long get_wchan(struct task_struct *p)
 	}
 	return 0;
 }
+
+unsigned long arch_align_stack(unsigned long sp)
+{
+	if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
+		sp -= get_random_int() & ~PAGE_MASK;
+	return sp & ~0xf;
+}