X-Git-Url: http://pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=kernel%2Fpanic.c;h=525e365f72390bb3fb4601c0be4c4bd81214eceb;hb=1ff5683043196b9ad628a5de6bf8eeca52ee8bfd;hp=d2db3e2209e0e20ae64f8c1537a09a048e95edfe;hpb=8da5adda91df3d2fcc5300e68da491694c9af019;p=linux-2.6-omap-h63xx.git

diff --git a/kernel/panic.c b/kernel/panic.c
index d2db3e2209e..525e365f723 100644
--- a/kernel/panic.c
+++ b/kernel/panic.c
@@ -21,7 +21,6 @@
 #include <linux/debug_locks.h>
 
 int panic_on_oops;
-int panic_on_unrecovered_nmi;
 int tainted;
 static int pause_on_oops;
 static int pause_on_oops_flag;
@@ -271,3 +270,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