summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFathi Boudra <fathi.boudra@linaro.org>2014-02-16 11:08:19 +0200
committerFathi Boudra <fathi.boudra@linaro.org>2014-02-16 11:08:19 +0200
commit06bd2e2dd323a9fbc95383378a73facaec1941ca (patch)
treef84427decff3c58d46ae9a2596100432e675b7f9
parentd5d261982aa2241db0eab5cd1bf76cddecb10c1c (diff)
In 3.14, CONFIG_CC_STACKPROTECTOR_STRONG is introduced and CONFIG_CC_STACKPROTECTOR is renamed to CONFIG_CC_STACKPROTECTOR_REGULAR. http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=8779657d29c0ebcc0c94ede4df2f497baf1b563f Signed-off-by: Fathi Boudra <fathi.boudra@linaro.org>
-rw-r--r--linaro/configs/distribution.conf2
1 files changed, 1 insertions, 1 deletions
diff --git a/linaro/configs/distribution.conf b/linaro/configs/distribution.conf
index 299af101ef19..e7bd73703273 100644
--- a/linaro/configs/distribution.conf
+++ b/linaro/configs/distribution.conf
@@ -3,7 +3,7 @@ CONFIG_CGROUPS=y
# CONFIG_COMPAT_BRK is not set
CONFIG_DEFAULT_MMAP_MIN_ADDR=32768
CONFIG_SECCOMP=y
-CONFIG_CC_STACKPROTECTOR=y
+CONFIG_CC_STACKPROTECTOR_REGULAR=y
CONFIG_SYN_COOKIES=y
CONFIG_IPV6=y
CONFIG_NETLABEL=y