]> git.baikalelectronics.ru Git - kernel.git/commit
x86: fix dependency of X86_32_LAZY_GS
authorMasahiro Yamada <yamada.masahiro@socionext.com>
Thu, 14 Jun 2018 10:36:43 +0000 (19:36 +0900)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 14 Jun 2018 22:15:27 +0000 (07:15 +0900)
commitb564d817441e6d072a8f3f76a2e4897006d28914
treedc28620f74cfab79af61794aa23dbf631f638f6e
parentb70262300972dc1993cfc58df641299ac4b27ac2
x86: fix dependency of X86_32_LAZY_GS

Commit ee2502342771 ("stack-protector: test compiler capability in
Kconfig and drop AUTO mode") replaced the 'choice' with two boolean
symbols, so CC_STACKPROTECTOR_NONE no longer exists.

Prior to commit 453a2ea9fb46 ("Makefile: move stack-protector
availability out of Kconfig"), this line was like this:

  depends on X86_32 && !CC_STACKPROTECTOR

The CC_ prefix was dropped by commit c35c3a3260b3 ("Kbuild: rename
CC_STACKPROTECTOR[_STRONG] config variables"), so the dependency now
should be:

  depends on X86_32 && !STACKPROTECTOR

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>
arch/x86/Kconfig