Merge tag 'usb-5.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb

[mirror_ubuntu-jammy-kernel.git] / init / Kconfig

diff --git a/init/Kconfig b/init/Kconfig
index 0498af567f7060fa4360ae0f2b73e3aea6298179..9082ed33a9cded1a795ff02ce5cece0fabf73448 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -191,13 +191,16 @@ config HAVE_KERNEL_LZO
 config HAVE_KERNEL_LZ4
        bool
 
+config HAVE_KERNEL_ZSTD
+       bool
+
 config HAVE_KERNEL_UNCOMPRESSED
        bool
 
 choice
        prompt "Kernel compression mode"
        default KERNEL_GZIP
-       depends on HAVE_KERNEL_GZIP || HAVE_KERNEL_BZIP2 || HAVE_KERNEL_LZMA || HAVE_KERNEL_XZ || HAVE_KERNEL_LZO || HAVE_KERNEL_LZ4 || HAVE_KERNEL_UNCOMPRESSED
+       depends on HAVE_KERNEL_GZIP || HAVE_KERNEL_BZIP2 || HAVE_KERNEL_LZMA || HAVE_KERNEL_XZ || HAVE_KERNEL_LZO || HAVE_KERNEL_LZ4 || HAVE_KERNEL_ZSTD || HAVE_KERNEL_UNCOMPRESSED
        help
          The linux kernel is a kind of self-extracting executable.
          Several compression algorithms are available, which differ
@@ -276,6 +279,16 @@ config KERNEL_LZ4
          is about 8% bigger than LZO. But the decompression speed is
          faster than LZO.
 
+config KERNEL_ZSTD
+       bool "ZSTD"
+       depends on HAVE_KERNEL_ZSTD
+       help
+         ZSTD is a compression algorithm targeting intermediate compression
+         with fast decompression speed. It will compress better than GZIP and
+         decompress around the same speed as LZO, but slower than LZ4. You
+         will need at least 192 KB RAM or more for booting. The zstd command
+         line tool is required for compression.
+
 config KERNEL_UNCOMPRESSED
        bool "None"
        depends on HAVE_KERNEL_UNCOMPRESSED
@@ -492,8 +505,23 @@ config HAVE_SCHED_AVG_IRQ
        depends on SMP
 
 config SCHED_THERMAL_PRESSURE
-       bool "Enable periodic averaging of thermal pressure"
+       bool
+       default y if ARM && ARM_CPU_TOPOLOGY
+       default y if ARM64
        depends on SMP
+       depends on CPU_FREQ_THERMAL
+       help
+         Select this option to enable thermal pressure accounting in the
+         scheduler. Thermal pressure is the value conveyed to the scheduler
+         that reflects the reduction in CPU compute capacity resulted from
+         thermal throttling. Thermal throttling occurs when the performance of
+         a CPU is capped due to high operating temperatures.
+
+         If selected, the scheduler will be able to balance tasks accordingly,
+         i.e. put less load on throttled CPUs than on non/less throttled ones.
+
+         This requires the architecture to implement
+         arch_set_thermal_pressure() and arch_get_thermal_pressure().
 
 config BSD_PROCESS_ACCT
        bool "BSD Process Accounting"
@@ -1957,7 +1985,7 @@ config MMAP_ALLOW_UNINITIALIZED
          userspace.  Since that isn't generally a problem on no-MMU systems,
          it is normally safe to say Y here.
 
-         See Documentation/nommu-mmap.txt for more information.
+         See Documentation/mm/nommu-mmap.rst for more information.
 
 config SYSTEM_DATA_VERIFICATION
        def_bool n