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

[GitHub/moto-9609/android_kernel_motorola_exynos9610.git] / init / Kconfig

diff --git a/init/Kconfig b/init/Kconfig
index 7a7acd9a54f5ec16d7603adcc1a0439fe3d2d4e4..2d60611c06093e1902407e1a6762afe6bda6c501 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -118,7 +118,6 @@ config HAVE_KERNEL_LZ4
 choice
        prompt "Kernel compression mode"
        default KERNEL_GZIP
 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
        help
          The linux kernel is a kind of self-extracting executable.
          Several compression algorithms are available, which differ


@@ -137,6 +136,13 @@ choice
 
          If in doubt, select 'gzip'
 
 
          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
 config KERNEL_GZIP
        bool "Gzip"
        depends on HAVE_KERNEL_GZIP


@@ -284,7 +290,7 @@ config AUDIT
 
 config AUDITSYSCALL
        bool "Enable system-call auditing support"
 
 config AUDITSYSCALL
        bool "Enable system-call auditing support"

-       depends on AUDIT && (X86 || PPC || S390 || IA64 || UML || SPARC64 || SUPERH || (ARM && AEABI && !OABI_COMPAT))
+       depends on AUDIT && (X86 || PARISC || PPC || S390 || IA64 || UML || SPARC64 || SUPERH || (ARM && AEABI && !OABI_COMPAT))

        default y if SECURITY_SELINUX
        help
          Enable low-overhead system-call auditing infrastructure that
        default y if SECURITY_SELINUX
        help
          Enable low-overhead system-call auditing infrastructure that


@@ -354,7 +360,8 @@ config VIRT_CPU_ACCOUNTING_NATIVE
 
 config VIRT_CPU_ACCOUNTING_GEN
        bool "Full dynticks CPU time accounting"
 
 config VIRT_CPU_ACCOUNTING_GEN
        bool "Full dynticks CPU time accounting"

-       depends on HAVE_CONTEXT_TRACKING && 64BIT
+       depends on HAVE_CONTEXT_TRACKING
+       depends on HAVE_VIRT_CPU_ACCOUNTING_GEN

        select VIRT_CPU_ACCOUNTING
        select CONTEXT_TRACKING
        help
        select VIRT_CPU_ACCOUNTING
        select CONTEXT_TRACKING
        help


@@ -1123,7 +1130,6 @@ config IPC_NS
 
 config USER_NS
        bool "User namespace"
 
 config USER_NS
        bool "User namespace"

-       depends on UIDGID_CONVERTED

        select UIDGID_STRICT_TYPE_CHECKS
 
        default n
        select UIDGID_STRICT_TYPE_CHECKS
 
        default n


@@ -1157,20 +1163,8 @@ config NET_NS
 
 endif # NAMESPACES
 
 
 endif # NAMESPACES
 

-config UIDGID_CONVERTED
-       # True if all of the selected software conmponents are known
-       # to have uid_t and gid_t converted to kuid_t and kgid_t
-       # where appropriate and are otherwise safe to use with
-       # the user namespace.
-       bool
-       default y
-
-       # Filesystems
-       depends on XFS_FS = n
-

 config UIDGID_STRICT_TYPE_CHECKS
        bool "Require conversions between uid/gids and their internal representation"
 config UIDGID_STRICT_TYPE_CHECKS
        bool "Require conversions between uid/gids and their internal representation"

-       depends on UIDGID_CONVERTED

        default n
        help
         While the nececessary conversions are being added to all subsystems this option allows
        default n
        help
         While the nececessary conversions are being added to all subsystems this option allows


@@ -1615,7 +1609,7 @@ endchoice
 
 config SLUB_CPU_PARTIAL
        default y
 
 config SLUB_CPU_PARTIAL
        default y

-       depends on SLUB
+       depends on SLUB && SMP

        bool "SLUB per cpu partial cache"
        help
          Per cpu partial caches accellerate objects allocation and freeing
        bool "SLUB per cpu partial cache"
        help
          Per cpu partial caches accellerate objects allocation and freeing


@@ -1683,6 +1677,7 @@ config BASE_SMALL
 
 menuconfig MODULES
        bool "Enable loadable module support"
 
 menuconfig MODULES
        bool "Enable loadable module support"

+       option modules

        help
          Kernel modules are small pieces of compiled code which can
          be inserted in the running kernel, rather than being
        help
          Kernel modules are small pieces of compiled code which can
          be inserted in the running kernel, rather than being