summaryrefslogtreecommitdiff
path: root/include/linux/stackprotector.h
diff options
context:
space:
mode:
authorSteven Rostedt <srostedt@redhat.com>2009-03-12 21:12:46 -0400
committerSteven Rostedt <srostedt@redhat.com>2009-03-12 21:12:46 -0400
commit51b643b404827d8fde60d7953773a42d46ca87e0 (patch)
treeae71fcbd8b3640b68fc11e1dca620a8ee96bac5f /include/linux/stackprotector.h
parent554f786e284a6ce859d51f62240d615603944c8e (diff)
parent480c93df5b99699390f93a7024c9f60d09da0e96 (diff)
Merge branch 'tracing/ftrace' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip into trace/tip/tracing/ftrace-merge
Diffstat (limited to 'include/linux/stackprotector.h')
-rw-r--r--include/linux/stackprotector.h16
1 files changed, 16 insertions, 0 deletions
diff --git a/include/linux/stackprotector.h b/include/linux/stackprotector.h
new file mode 100644
index 000000000000..6f3e54c704c0
--- /dev/null
+++ b/include/linux/stackprotector.h
@@ -0,0 +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