Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[firefly-linux-kernel-4.4.55.git] / init / Kconfig

diff --git a/init/Kconfig b/init/Kconfig
index 7260b27ebbabeb4537bc747cc604858e070baf00..53c41a84dd0396abeaffb3c2d122cffdeb15810a 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -820,7 +820,7 @@ config IKCONFIG_PROC
 
 config LOG_BUF_SHIFT
        int "Kernel log buffer size (16 => 64KB, 17 => 128KB)"
 
 config LOG_BUF_SHIFT
        int "Kernel log buffer size (16 => 64KB, 17 => 128KB)"

-       range 12 21
+       range 12 25

        default 17
        depends on PRINTK
        help
        default 17
        depends on PRINTK
        help


@@ -924,6 +924,7 @@ config NUMA_BALANCING_DEFAULT_ENABLED
 menuconfig CGROUPS
        bool "Control Group support"
        select KERNFS
 menuconfig CGROUPS
        bool "Control Group support"
        select KERNFS

+       select PERCPU_RWSEM

        help
          This option adds support for grouping sets of processes together, for
          use with process control subsystems such as Cpusets, CFS, memory
        help
          This option adds support for grouping sets of processes together, for
          use with process control subsystems such as Cpusets, CFS, memory


@@ -1136,6 +1137,7 @@ endif # CGROUPS
 
 config CHECKPOINT_RESTORE
        bool "Checkpoint/restore support" if EXPERT
 
 config CHECKPOINT_RESTORE
        bool "Checkpoint/restore support" if EXPERT

+       select PROC_CHILDREN

        default n
        help
          Enables additional kernel features in a sake of checkpoint/restore.
        default n
        help
          Enables additional kernel features in a sake of checkpoint/restore.


@@ -1939,26 +1941,21 @@ config MODULE_COMPRESS
        bool "Compress modules on installation"
        depends on MODULES
        help
        bool "Compress modules on installation"
        depends on MODULES
        help

-         This option compresses the kernel modules when 'make
-         modules_install' is run.

 
 

-         The modules will be compressed either using gzip or xz depend on the
-         choice made in "Compression algorithm".
+         Compresses kernel modules when 'make modules_install' is run; gzip or
+         xz depending on "Compression algorithm" below.

 
 

-         module-init-tools has support for gzip format while kmod handle gzip
-         and xz compressed modules.
+         module-init-tools MAY support gzip, and kmod MAY support gzip and xz.

 
 

-         When a kernel module is installed from outside of the main kernel
-         source and uses the Kbuild system for installing modules then that
-         kernel module will also be compressed when it is installed.
+         Out-of-tree kernel modules installed using Kbuild will also be
+         compressed upon installation.

 
 

-         This option provides little benefit when the modules are to be used inside
-         an initrd or initramfs, it generally is more efficient to compress the whole
-         initrd or initramfs instead.
+         Note: for modules inside an initrd or initramfs, it's more efficient
+         to compress the whole initrd or initramfs instead.

 
 

-         This is fully compatible with signed modules while the signed module is
-         compressed. module-init-tools or kmod handles decompression and provide to
-         other layer the uncompressed but signed payload.
+         Note: This is fully compatible with signed modules.
+
+         If in doubt, say N.

 
 choice
        prompt "Compression algorithm"
 
 choice
        prompt "Compression algorithm"


@@ -1980,6 +1977,10 @@ endchoice
 
 endif # MODULES
 
 
 endif # MODULES
 

+config MODULES_TREE_LOOKUP
+       def_bool y
+       depends on PERF_EVENTS || TRACING
+

 config INIT_ALL_POSSIBLE
        bool
        help
 config INIT_ALL_POSSIBLE
        bool
        help