diff options
| author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2018-06-14 12:36:44 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-06-15 00:15:28 +0200 |
| commit | a0f8c29706cb86689ce601cd6ad296160703832a (patch) | |
| tree | 74832376b131f4ed103604484bfd19f84f6cdaa1 | |
| parent | x86: fix dependency of X86_32_LAZY_GS (diff) | |
| download | linux-a0f8c29706cb86689ce601cd6ad296160703832a.tar.xz 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>
| -rw-r--r-- | kernel/configs/tiny.config | 4 |
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 |