Merge git://git.infradead.org/users/eparis/audit

[~andy/linux] / init / Kconfig

diff --git a/init/Kconfig b/init/Kconfig
index 5496f307988ee44603ead02db2b2c5caa48511bd..296dfcaf613fcc5daa618f263ebd5435028f0cb4 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -118,6 +118,7 @@ config HAVE_KERNEL_LZ4
 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
        help
          The linux kernel is a kind of self-extracting executable.
          Several compression algorithms are available, which differ
@@ -136,13 +137,6 @@ choice
 
          If in doubt, select 'gzip'
 
-config KERNEL_UNCOMPRESSED
-       bool "No compression"
-       help
-         No compression at all. The kernel is huge but the compression and
-         decompression times are zero.
-         This is usually not what you want.
-
 config KERNEL_GZIP
        bool "Gzip"
        depends on HAVE_KERNEL_GZIP
@@ -307,20 +301,6 @@ config AUDIT_TREE
        depends on AUDITSYSCALL
        select FSNOTIFY
 
-config AUDIT_LOGINUID_IMMUTABLE
-       bool "Make audit loginuid immutable"
-       depends on AUDIT
-       help
-         The config option toggles if a task setting its loginuid requires
-         CAP_SYS_AUDITCONTROL or if that task should require no special permissions
-         but should instead only allow setting its loginuid if it was never
-         previously set.  On systems which use systemd or a similar central
-         process to restart login services this should be set to true.  On older
-         systems in which an admin would typically have to directly stop and
-         start processes this should be set to false.  Setting this to true allows
-         one to drop potentially dangerous capabilites from the login tasks,
-         but may not be backwards compatible with older init systems.
-
 source "kernel/irq/Kconfig"
 source "kernel/time/Kconfig"
 
@@ -851,7 +831,7 @@ config NUMA_BALANCING_DEFAULT_ENABLED
        default y
        depends on NUMA_BALANCING
        help
-         If set, autonumic NUMA balancing will be enabled if running on a NUMA
+         If set, automatic NUMA balancing will be enabled if running on a NUMA
          machine.
 
 config NUMA_BALANCING
@@ -862,7 +842,7 @@ config NUMA_BALANCING
        help
          This option adds support for automatic NUMA aware memory/task placement.
          The mechanism is quite primitive and is based on migrating memory when
-         it is references to the node the task is running on.
+         it has references to the node the task is running on.
 
          This system will be inactive on UMA systems.