[NET_SCHED]: cls_tcindex: fix compatibility breakage

[karo-tx-linux.git] / Makefile

diff --git a/Makefile b/Makefile
index 9ae82c0b6821c7a740f59b16794c1d3762f24ee9..659833fa2e480dc0d93b234ef1afd48da26beb75 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 VERSION = 2
 PATCHLEVEL = 6
 SUBLEVEL = 16
-EXTRAVERSION = .30-rc1
+EXTRAVERSION = .47
 NAME=Stable Penguin
 
 # *DOCUMENTATION*
@@ -511,6 +511,8 @@ CFLAGS              += $(call add-align,CONFIG_CC_ALIGN_LABELS,-labels)
 CFLAGS         += $(call add-align,CONFIG_CC_ALIGN_LOOPS,-loops)
 CFLAGS         += $(call add-align,CONFIG_CC_ALIGN_JUMPS,-jumps)
 
+include $(srctree)/arch/$(ARCH)/Makefile
+
 ifdef CONFIG_FRAME_POINTER
 CFLAGS         += -fno-omit-frame-pointer $(call cc-option,-fno-optimize-sibling-calls,)
 else
@@ -521,7 +523,8 @@ ifdef CONFIG_DEBUG_INFO
 CFLAGS         += -g
 endif
 
-include $(srctree)/arch/$(ARCH)/Makefile
+# Force gcc to behave correct even for buggy distributions
+CFLAGS         += $(call cc-option, -fno-stack-protector)
 
 # arch Makefile may override CC so keep this after arch Makefile is included
 NOSTDINC_FLAGS += -nostdinc -isystem $(shell $(CC) -print-file-name=include)