From 4cf6b223b0156a547c74ff3b55733958069a3014 Mon Sep 17 00:00:00 2001
From: Arjan van de Ven <arjan@linux.intel.com>
Date: Tue, 26 Sep 2006 10:52:39 +0200
Subject: [PATCH] --- yaml --- r: 35936 b: refs/heads/master c:
 3162f751d04086a9d006342de63ac8f44fe0f72a h: refs/heads/master v: v3

---
 [refs]               |  2 +-
 trunk/kernel/panic.c | 12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 9772598839bc..e7ca37e3e15d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0a4254058037eb172758961d0a5b94f4320a1425
+refs/heads/master: 3162f751d04086a9d006342de63ac8f44fe0f72a
diff --git a/trunk/kernel/panic.c b/trunk/kernel/panic.c
index d2db3e2209e0..6ceb664fb52a 100644
--- a/trunk/kernel/panic.c
+++ b/trunk/kernel/panic.c
@@ -271,3 +271,15 @@ void oops_exit(void)
 {
 	do_oops_enter_exit();
 }
+
+#ifdef CONFIG_CC_STACKPROTECTOR
+/*
+ * Called when gcc's -fstack-protector feature is used, and
+ * gcc detects corruption of the on-stack canary value
+ */
+void __stack_chk_fail(void)
+{
+	panic("stack-protector: Kernel stack is corrupted");
+}
+EXPORT_SYMBOL(__stack_chk_fail);
+#endif