summaryrefslogtreecommitdiffstats
path: root/kernel/configs
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.masahiro@socionext.com>2018-06-14 19:36:44 +0900
committerLinus Torvalds <torvalds@linux-foundation.org>2018-06-15 07:15:28 +0900
commita0f8c29706cb86689ce601cd6ad296160703832a (patch)
tree74832376b131f4ed103604484bfd19f84f6cdaa1 /kernel/configs
parent8458f8c2d4e1f7362c65c37ccf2d1d5c00f77fa5 (diff)
downloadlinux-a0f8c29706cb86689ce601cd6ad296160703832a.tar.gz
linux-a0f8c29706cb86689ce601cd6ad296160703832a.tar.bz2
linux-a0f8c29706cb86689ce601cd6ad296160703832a.zip
kconfig: tinyconfig: remove stale stack protector fixups
Prior to commit 2a61f4747eea ("stack-protector: test compiler capability in Kconfig and drop AUTO mode"), the stack protector was configured by the choice of NONE, REGULAR, STRONG, AUTO. tiny.config needed to explicitly set NONE because the default value of choice, AUTO, did not produce the tiniest kernel. Now that there are only two boolean symbols, STACKPROTECTOR and STACKPROTECTOR_STRONG, they are naturally disabled by "make allnoconfig", which "make tinyconfig" is based on. Remove unnecessary lines from the tiny.config fragment file. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> Acked-by: Kees Cook <keescook@chromium.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'kernel/configs')
-rw-r--r--kernel/configs/tiny.config4
1 files changed, 0 insertions, 4 deletions
diff --git a/kernel/configs/tiny.config b/kernel/configs/tiny.config
index 9bfdffc100da..7fa0c4ae6394 100644
--- a/kernel/configs/tiny.config
+++ b/kernel/configs/tiny.config
@@ -10,7 +10,3 @@ CONFIG_OPTIMIZE_INLINING=y
# CONFIG_SLAB is not set
# CONFIG_SLUB is not set
CONFIG_SLOB=y
-CONFIG_CC_STACKPROTECTOR_NONE=y
-# CONFIG_CC_STACKPROTECTOR_REGULAR is not set
-# CONFIG_CC_STACKPROTECTOR_STRONG is not set
-# CONFIG_CC_STACKPROTECTOR_AUTO is not set