diff --git a/[refs] b/[refs]
index 3f025f5f585c..0b7486436649 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 18aa8bb12dcb10adc3d7c9d69714d53667c0ab7f
+refs/heads/master: 420594296838fdc9a674470d710cda7d1487f9f4
diff --git a/trunk/arch/x86/kernel/process_64.c b/trunk/arch/x86/kernel/process_64.c
index 5107cb214c7b..cce47f7fbf22 100644
--- a/trunk/arch/x86/kernel/process_64.c
+++ b/trunk/arch/x86/kernel/process_64.c
@@ -16,6 +16,7 @@
 
 #include <stdarg.h>
 
+#include <linux/stackprotector.h>
 #include <linux/cpu.h>
 #include <linux/errno.h>
 #include <linux/sched.h>
diff --git a/trunk/include/linux/stackprotector.h b/trunk/include/linux/stackprotector.h
index 422e71aafd0b..6f3e54c704c0 100644
--- a/trunk/include/linux/stackprotector.h
+++ b/trunk/include/linux/stackprotector.h
@@ -1,6 +1,10 @@
 #ifndef _LINUX_STACKPROTECTOR_H
 #define _LINUX_STACKPROTECTOR_H 1
 
+#include <linux/compiler.h>
+#include <linux/sched.h>
+#include <linux/random.h>
+
 #ifdef CONFIG_CC_STACKPROTECTOR
 # include <asm/stackprotector.h>
 #else
diff --git a/trunk/init/main.c b/trunk/init/main.c
index a84322ca64a2..b44e4eb0f5e3 100644
--- a/trunk/init/main.c
+++ b/trunk/init/main.c
@@ -546,6 +546,12 @@ asmlinkage void __init start_kernel(void)
 	unwind_init();
 	lockdep_init();
 	debug_objects_early_init();
+
+	/*
+	 * Set up the the initial canary ASAP:
+	 */
+	boot_init_stack_canary();
+
 	cgroup_init_early();
 
 	local_irq_disable();