Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable

[~andy/linux] / include / linux / stackprotector.h

diff --git a/include/linux/stackprotector.h b/include/linux/stackprotector.h
index d3e8bbe602f8a62be08a8662137740b6ed5ea0e4..6f3e54c704c00257a4180934bee801b488570d59 100644 (file)
--- a/include/linux/stackprotector.h
+++ b/include/linux/stackprotector.h
@@ -1,8 +1,16 @@
 #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
+static inline void boot_init_stack_canary(void)
+{
+}
 #endif
 
 #endif