diff --git a/arch/x86/kernel/process.c b/arch/x86/kernel/process.c
index c7ce3655b707..84e68ab27c9b 100644
--- a/arch/x86/kernel/process.c
+++ b/arch/x86/kernel/process.c
@@ -4,6 +4,7 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/mm.h>
+#include <linux/page_size_compat.h>
 #include <linux/smp.h>
 #include <linux/cpu.h>
 #include <linux/prctl.h>
@@ -1006,7 +1007,7 @@ early_param("idle", idle_setup);
 unsigned long arch_align_stack(unsigned long sp)
 {
 	if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
-		sp -= get_random_u32_below(8192);
+		sp -= get_random_u32_below(__PAGE_SIZE << 1);
 	return sp & ~0xf;
 }