X-Git-Url: https://bbs.cooldavid.org/git/?a=blobdiff_plain;f=Makefile;h=b280cfcf1efe630c0ec183c7a3e280e555c00222;hb=494df596f9c315e20523894caa2a2938db3e5d8d;hp=7715b2c14fb48d59fbd05c4bee18d66df2188bc3;hpb=be716615fe596ee117292dc615e95f707fb67fd1;p=net-next-2.6.git

diff --git a/Makefile b/Makefile
index 7715b2c14fb..b280cfcf1ef 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 VERSION = 2
 PATCHLEVEL = 6
 SUBLEVEL = 29
-EXTRAVERSION = -rc3
+EXTRAVERSION = -rc5
 NAME = Erotic Pickled Herring
 
 # *DOCUMENTATION*
@@ -532,8 +532,9 @@ KBUILD_CFLAGS += $(call cc-option,-Wframe-larger-than=${CONFIG_FRAME_WARN})
 endif
 
 # Force gcc to behave correct even for buggy distributions
-# Arch Makefiles may override this setting
+ifndef CONFIG_CC_STACKPROTECTOR
 KBUILD_CFLAGS += $(call cc-option, -fno-stack-protector)
+endif
 
 ifdef CONFIG_FRAME_POINTER
 KBUILD_CFLAGS	+= -fno-omit-frame-pointer -fno-optimize-sibling-calls