1 files changed, 4 insertions, 1 deletions

diff --git a/arch/s390/mm/mmap.c b/arch/s390/mm/mmap.c
index d008f638b2cd..179a2c20b01f 100644
--- a/arch/s390/mm/mmap.c
+++ b/arch/s390/mm/mmap.c
@@ -183,7 +183,10 @@ unsigned long randomize_et_dyn(void)
 {
         unsigned long base;
 
-        base = (STACK_TOP / 3 * 2) & (~mmap_align_mask << PAGE_SHIFT);
+        base = STACK_TOP / 3 * 2;
+        if (!is_32bit_task())
+                /* Align to 4GB */
+                base &= ~((1UL << 32) - 1);
         return base + mmap_rnd();
 }