From e17dafdcfee3f4e27be083183f6e408636a83147 Mon Sep 17 00:00:00 2001
From: Ingo Molnar <mingo@elte.hu>
Date: Thu, 14 Feb 2008 09:41:09 +0100
Subject: [PATCH] --- yaml --- r: 136351 b: refs/heads/master c:
 9b5609fd773e6ac0b1d6d6e1bf68f32cca64e06b h: refs/heads/master i:   136349:
 0de3f40d2a48dd1d3979fabacba5d5aaaa62d146   136347:
 818cc47b764cbdcb458aa34bbf4833a124381f83   136343:
 20f1721575c01f1b439cfda5242aba23b2e979be   136335:
 cb514d77854c06b6b607c2e0be40092ef9acbd5e   136319:
 88eccf2938b7ea502d7ebe109bc6442bab3c9713 v: v3

---
 [refs]                                 | 2 +-
 trunk/include/asm-x86/stackprotector.h | 4 ++++
 trunk/include/linux/stackprotector.h   | 8 ++++++++
 trunk/init/main.c                      | 1 +
 4 files changed, 14 insertions(+), 1 deletion(-)
 create mode 100644 trunk/include/asm-x86/stackprotector.h
 create mode 100644 trunk/include/linux/stackprotector.h

diff --git a/[refs] b/[refs]
index 1f72204811af..a13d89b3e2c5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 72370f2a5b227bd3817593a6b15ea3f53f51dfcb
+refs/heads/master: 9b5609fd773e6ac0b1d6d6e1bf68f32cca64e06b
diff --git a/trunk/include/asm-x86/stackprotector.h b/trunk/include/asm-x86/stackprotector.h
new file mode 100644
index 000000000000..dcac7a6bdba2
--- /dev/null
+++ b/trunk/include/asm-x86/stackprotector.h
@@ -0,0 +1,4 @@
+#ifndef _ASM_STACKPROTECTOR_H
+#define _ASM_STACKPROTECTOR_H 1
+
+#endif
diff --git a/trunk/include/linux/stackprotector.h b/trunk/include/linux/stackprotector.h
new file mode 100644
index 000000000000..d3e8bbe602f8
--- /dev/null
+++ b/trunk/include/linux/stackprotector.h
@@ -0,0 +1,8 @@
+#ifndef _LINUX_STACKPROTECTOR_H
+#define _LINUX_STACKPROTECTOR_H 1
+
+#ifdef CONFIG_CC_STACKPROTECTOR
+# include <asm/stackprotector.h>
+#endif
+
+#endif
diff --git a/trunk/init/main.c b/trunk/init/main.c
index f7fb20021d48..a84322ca64a2 100644
--- a/trunk/init/main.c
+++ b/trunk/init/main.c
@@ -14,6 +14,7 @@
 #include <linux/proc_fs.h>
 #include <linux/kernel.h>
 #include <linux/syscalls.h>
+#include <linux/stackprotector.h>
 #include <linux/string.h>
 #include <linux/ctype.h>
 #include <linux/delay.h>