UBUNTU: [config] update config for master changes

[mirror_ubuntu-artful-kernel.git] / Makefile

diff --git a/Makefile b/Makefile
index 768f83a26230c3ce2904f82175f954e8104d9460..678197c10e66492c78220f05f1c2bc1a0bdeaf10 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 VERSION = 4
 PATCHLEVEL = 4
-SUBLEVEL = 83
+SUBLEVEL = 117
 EXTRAVERSION =
 NAME = Blurry Fish Butt
 
@@ -798,6 +798,9 @@ KBUILD_CFLAGS += $(call cc-disable-warning, pointer-sign)
 # disable invalid "can't wrap" optimizations for signed / pointers
 KBUILD_CFLAGS  += $(call cc-option,-fno-strict-overflow)
 
+# Make sure -fstack-check isn't enabled (like gentoo apparently did)
+KBUILD_CFLAGS  += $(call cc-option,-fno-stack-check,)
+
 # conserve stack if available
 KBUILD_CFLAGS   += $(call cc-option,-fconserve-stack)