Revert "Add build option to to set the default panic timeout."

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

diff --git a/init/Kconfig b/init/Kconfig
index 44421cd0b12604e77302904344adc3b0fa8737e4..714597c6f8426c85227892c1b1c9eabdd42bf0e1 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -115,13 +115,11 @@ config HAVE_KERNEL_BZIP2
 config HAVE_KERNEL_LZMA
        bool
 
 config HAVE_KERNEL_LZMA
        bool
 

-config HAVE_KERNEL_LZO
-       bool
-

 choice
        prompt "Kernel compression mode"
 choice
        prompt "Kernel compression mode"

+       default KERNEL_LZO if ARCH_RK29

        default KERNEL_GZIP
        default KERNEL_GZIP

-       depends on HAVE_KERNEL_GZIP || HAVE_KERNEL_BZIP2 || HAVE_KERNEL_LZMA || HAVE_KERNEL_LZO
+       depends on HAVE_KERNEL_GZIP || HAVE_KERNEL_BZIP2 || HAVE_KERNEL_LZMA

        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


@@ -144,8 +142,9 @@ config KERNEL_GZIP
        bool "Gzip"
        depends on HAVE_KERNEL_GZIP
        help
        bool "Gzip"
        depends on HAVE_KERNEL_GZIP
        help

-         The old and tried gzip compression. It provides a good balance
-         between compression ratio and decompression speed.
+         The old and tried gzip compression. Its compression ratio is
+         the poorest among the 3 choices; however its speed (both
+         compression and decompression) is the fastest.

 
 config KERNEL_BZIP2
        bool "Bzip2"
 
 config KERNEL_BZIP2
        bool "Bzip2"


@@ -166,14 +165,6 @@ config KERNEL_LZMA
          two. Compression is slowest.  The kernel size is about 33%
          smaller with LZMA in comparison to gzip.
 
          two. Compression is slowest.  The kernel size is about 33%
          smaller with LZMA in comparison to gzip.
 

-config KERNEL_LZO
-       bool "LZO"
-       depends on HAVE_KERNEL_LZO
-       help
-         Its compression ratio is the poorest among the 4. The kernel
-         size is about about 10% bigger than gzip; however its speed
-         (both compression and decompression) is the fastest.
-

 endchoice
 
 config SWAP
 endchoice
 
 config SWAP


@@ -436,6 +427,57 @@ config LOG_BUF_SHIFT
 config HAVE_UNSTABLE_SCHED_CLOCK
        bool
 
 config HAVE_UNSTABLE_SCHED_CLOCK
        bool
 

+config GROUP_SCHED
+       bool "Group CPU scheduler"
+       depends on EXPERIMENTAL
+       default n
+       help
+         This feature lets CPU scheduler recognize task groups and control CPU
+         bandwidth allocation to such task groups.
+         In order to create a group from arbitrary set of processes, use
+         CONFIG_CGROUPS. (See Control Group support.)
+
+config FAIR_GROUP_SCHED
+       bool "Group scheduling for SCHED_OTHER"
+       depends on GROUP_SCHED
+       default GROUP_SCHED
+
+config RT_GROUP_SCHED
+       bool "Group scheduling for SCHED_RR/FIFO"
+       depends on EXPERIMENTAL
+       depends on GROUP_SCHED
+       default n
+       help
+         This feature lets you explicitly allocate real CPU bandwidth
+         to users or control groups (depending on the "Basis for grouping tasks"
+         setting below. If enabled, it will also make it impossible to
+         schedule realtime tasks for non-root users until you allocate
+         realtime bandwidth for them.
+         See Documentation/scheduler/sched-rt-group.txt for more information.
+
+choice
+       depends on GROUP_SCHED
+       prompt "Basis for grouping tasks"
+       default USER_SCHED
+
+config USER_SCHED
+       bool "user id"
+       help
+         This option will choose userid as the basis for grouping
+         tasks, thus providing equal CPU bandwidth to each user.
+
+config CGROUP_SCHED
+       bool "Control groups"
+       depends on CGROUPS
+       help
+         This option allows you to create arbitrary task groups
+         using the "cgroup" pseudo filesystem and control
+         the cpu bandwidth allocated to each such task group.
+         Refer to Documentation/cgroups/cgroups.txt for more
+         information on "cgroup" pseudo filesystem.
+
+endchoice
+

 menuconfig CGROUPS
        boolean "Control Group support"
        help
 menuconfig CGROUPS
        boolean "Control Group support"
        help


@@ -556,35 +598,6 @@ config CGROUP_MEM_RES_CTLR_SWAP
          Now, memory usage of swap_cgroup is 2 bytes per entry. If swap page
          size is 4096bytes, 512k per 1Gbytes of swap.
 
          Now, memory usage of swap_cgroup is 2 bytes per entry. If swap page
          size is 4096bytes, 512k per 1Gbytes of swap.
 

-menuconfig CGROUP_SCHED
-       bool "Group CPU scheduler"
-       depends on EXPERIMENTAL && CGROUPS
-       default n
-       help
-         This feature lets CPU scheduler recognize task groups and control CPU
-         bandwidth allocation to such task groups. It uses cgroups to group
-         tasks.
-
-if CGROUP_SCHED
-config FAIR_GROUP_SCHED
-       bool "Group scheduling for SCHED_OTHER"
-       depends on CGROUP_SCHED
-       default CGROUP_SCHED
-
-config RT_GROUP_SCHED
-       bool "Group scheduling for SCHED_RR/FIFO"
-       depends on EXPERIMENTAL
-       depends on CGROUP_SCHED
-       default n
-       help
-         This feature lets you explicitly allocate real CPU bandwidth
-         to task groups. If enabled, it will also make it impossible to
-         schedule realtime tasks for non-root users until you allocate
-         realtime bandwidth for them.
-         See Documentation/scheduler/sched-rt-group.txt for more information.
-
-endif #CGROUP_SCHED
-

 endif # CGROUPS
 
 config MM_OWNER
 endif # CGROUPS
 
 config MM_OWNER


@@ -725,12 +738,6 @@ config SYSCTL
 config ANON_INODES
        bool
 
 config ANON_INODES
        bool
 

-config PANIC_TIMEOUT
-       int "Default panic timeout"
-       default 0
-       help
-         Set default panic timeout.
-

 menuconfig EMBEDDED
        bool "Configure standard kernel features (for small systems)"
        help
 menuconfig EMBEDDED
        bool "Configure standard kernel features (for small systems)"
        help


@@ -902,15 +909,6 @@ config SHMEM
          option replaces shmem and tmpfs with the much simpler ramfs code,
          which may be appropriate on small systems without swap.
 
          option replaces shmem and tmpfs with the much simpler ramfs code,
          which may be appropriate on small systems without swap.
 

-config ASHMEM
-       bool "Enable the Anonymous Shared Memory Subsystem"
-       default n
-       depends on SHMEM || TINY_SHMEM
-       help
-         The ashmem subsystem is a new shared memory allocator, similar to
-         POSIX SHM but with different behavior and sporting a simpler
-         file-based API.
-

 config AIO
        bool "Enable AIO support" if EMBEDDED
        default y
 config AIO
        bool "Enable AIO support" if EMBEDDED
        default y


@@ -1053,7 +1051,6 @@ config SLAB
          per cpu and per node queues.
 
 config SLUB
          per cpu and per node queues.
 
 config SLUB

-       depends on BROKEN || NUMA || !DISCONTIGMEM

        bool "SLUB (Unqueued Allocator)"
        help
           SLUB is a slab allocator that minimizes cache line usage
        bool "SLUB (Unqueued Allocator)"
        help
           SLUB is a slab allocator that minimizes cache line usage