From c6766667a7d4ffc945436406b5bf8825248127d0 Mon Sep 17 00:00:00 2001
From: Arjan van de Ven <arjan@linux.intel.com>
Date: Fri, 18 Apr 2008 06:16:45 -0700
Subject: [PATCH] --- yaml --- r: 136358 b: refs/heads/master c:
 b40a4392a3c262e0d1b5379b4e142a8eefa63439 h: refs/heads/master v: v3

---
 [refs]                  | 2 +-
 trunk/arch/x86/Makefile | 2 +-
 trunk/kernel/panic.c    | 3 +++
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index ec24e9cb2c49..abd08c0ca9bf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b719ac56c0032bc1602914c6ea70b0f1581b08c7
+refs/heads/master: b40a4392a3c262e0d1b5379b4e142a8eefa63439
diff --git a/trunk/arch/x86/Makefile b/trunk/arch/x86/Makefile
index 3cff3c894cf3..c3e0eeeb1dd2 100644
--- a/trunk/arch/x86/Makefile
+++ b/trunk/arch/x86/Makefile
@@ -73,7 +73,7 @@ else
 
         stackp := $(CONFIG_SHELL) $(srctree)/scripts/gcc-x86_64-has-stack-protector.sh
         stackp-$(CONFIG_CC_STACKPROTECTOR) := $(shell $(stackp) \
-                "$(CC)" -fstack-protector )
+                "$(CC)" "-fstack-protector -DGCC_HAS_SP" )
         stackp-$(CONFIG_CC_STACKPROTECTOR_ALL) += $(shell $(stackp) \
                 "$(CC)" -fstack-protector-all )
 
diff --git a/trunk/kernel/panic.c b/trunk/kernel/panic.c
index 866be9b72e4f..6729e3f4ebcb 100644
--- a/trunk/kernel/panic.c
+++ b/trunk/kernel/panic.c
@@ -325,6 +325,9 @@ EXPORT_SYMBOL(warn_on_slowpath);
 
 #ifdef CONFIG_CC_STACKPROTECTOR
 
+#ifndef GCC_HAS_SP
+#warning You have selected the CONFIG_CC_STACKPROTECTOR option, but the gcc used does not support this.
+#endif
 static unsigned long __stack_check_testing;
 /*
  * Self test function for the stack-protector feature.