diff --git a/[refs] b/[refs]
index 6a76674faa9d..ebb7bcfb39f5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2fd818642a3c3a257f3b1262145a52bc1bfebd26
+refs/heads/master: 08c2b394b98786ebb067e2a54d08f1f6f0d247da
diff --git a/trunk/arch/x86/Makefile b/trunk/arch/x86/Makefile
index 8aa1b59b9074..e8c8881351b3 100644
--- a/trunk/arch/x86/Makefile
+++ b/trunk/arch/x86/Makefile
@@ -74,7 +74,7 @@ endif
 
 ifdef CONFIG_CC_STACKPROTECTOR
 	cc_has_sp := $(srctree)/scripts/gcc-x86_$(BITS)-has-stack-protector.sh
-        ifeq ($(shell $(CONFIG_SHELL) $(cc_has_sp) $(CC) $(biarch)),y)
+        ifeq ($(shell $(CONFIG_SHELL) $(cc_has_sp) $(CC) $(KBUILD_CPPFLAGS) $(biarch)),y)
                 stackp-y := -fstack-protector
                 KBUILD_CFLAGS += $(stackp-y)
         else