Merge tag 'nfsd-4.16' of git://linux-nfs.org/~bfields/linux

[sfrench/cifs-2.6.git] / arch / Kconfig

diff --git a/arch/Kconfig b/arch/Kconfig
index 9330a9d79dc357d3a28438965b71cf8aee67f761..76c0b54443b1fd7563414622988032d9f63fc11f 100644 (file)
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -541,7 +541,7 @@ config HAVE_CC_STACKPROTECTOR
 choice
        prompt "Stack Protector buffer overflow detection"
        depends on HAVE_CC_STACKPROTECTOR
-       default CC_STACKPROTECTOR_NONE
+       default CC_STACKPROTECTOR_AUTO
        help
          This option turns on the "stack-protector" GCC feature. This
          feature puts, at the beginning of functions, a canary value on
@@ -588,6 +588,12 @@ config CC_STACKPROTECTOR_STRONG
          about 20% of all kernel functions, which increases the kernel code
          size by about 2%.
 
+config CC_STACKPROTECTOR_AUTO
+       bool "Automatic"
+       help
+         If the compiler supports it, the best available stack-protector
+         option will be chosen.
+
 endchoice
 
 config THIN_ARCHIVES