mptcp: free resources when the port number is mismatched

[linux-2.6-microblaze.git] / init / Kconfig

diff --git a/init/Kconfig b/init/Kconfig
index ba8bd52..719871f 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -26,30 +26,36 @@ config CC_VERSION_TEXT
            and then every file will be rebuilt.
 
 config CC_IS_GCC
-       def_bool $(success,echo "$(CC_VERSION_TEXT)" | grep -q gcc)
+       def_bool $(success,test "$(cc-name)" = GCC)
 
 config GCC_VERSION
        int
-       default $(shell,$(srctree)/scripts/gcc-version.sh $(CC)) if CC_IS_GCC
+       default $(cc-version) if CC_IS_GCC
        default 0
 
-config LD_VERSION
-       int
-       default $(shell,$(LD) --version | $(srctree)/scripts/ld-version.sh)
-
 config CC_IS_CLANG
-       def_bool $(success,echo "$(CC_VERSION_TEXT)" | grep -q clang)
-
-config LD_IS_LLD
-       def_bool $(success,$(LD) -v | head -n 1 | grep -q LLD)
+       def_bool $(success,test "$(cc-name)" = Clang)
 
 config CLANG_VERSION
        int
-       default $(shell,$(srctree)/scripts/clang-version.sh $(CC))
+       default $(cc-version) if CC_IS_CLANG
+       default 0
+
+config LD_IS_BFD
+       def_bool $(success,test "$(ld-name)" = BFD)
+
+config LD_VERSION
+       int
+       default $(ld-version) if LD_IS_BFD
+       default 0
+
+config LD_IS_LLD
+       def_bool $(success,test "$(ld-name)" = LLD)
 
 config LLD_VERSION
        int
-       default $(shell,$(srctree)/scripts/lld-version.sh $(LD))
+       default $(ld-version) if LD_IS_LLD
+       default 0
 
 config CC_CAN_LINK
        bool
@@ -1861,20 +1867,6 @@ config SLUB_DEBUG
          SLUB sysfs support. /sys/slab will not exist and there will be
          no support for cache validation etc.
 
-config SLUB_MEMCG_SYSFS_ON
-       default n
-       bool "Enable memcg SLUB sysfs support by default" if EXPERT
-       depends on SLUB && SYSFS && MEMCG
-       help
-         SLUB creates a directory under /sys/kernel/slab for each
-         allocation cache to host info and debug files. If memory
-         cgroup is enabled, each cache can have per memory cgroup
-         caches. SLUB can create the same sysfs directories for these
-         caches under /sys/kernel/slab/CACHE/cgroup but it can lead
-         to a very high number of debug files being created. This is
-         controlled by slub_memcg_sysfs boot parameter and this
-         config option determines the parameter's default value.
-
 config COMPAT_BRK
        bool "Disable heap randomization"
        default y
@@ -2273,8 +2265,8 @@ config MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS
          If unsure, say N.
 
 config TRIM_UNUSED_KSYMS
-       bool "Trim unused exported kernel symbols"
-       depends on BROKEN
+       bool "Trim unused exported kernel symbols" if EXPERT
+       depends on !COMPILE_TEST
        help
          The kernel and some modules make many symbols available for
          other modules to use via EXPORT_SYMBOL() and variants. Depending