Merge branch 'sched/urgent' into sched/core
Merge reason: Merge dependent fix, update to latest -rc. Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
18
init/Kconfig
18
init/Kconfig
@@ -115,10 +115,13 @@ config HAVE_KERNEL_BZIP2
|
||||
config HAVE_KERNEL_LZMA
|
||||
bool
|
||||
|
||||
config HAVE_KERNEL_LZO
|
||||
bool
|
||||
|
||||
choice
|
||||
prompt "Kernel compression mode"
|
||||
default KERNEL_GZIP
|
||||
depends on HAVE_KERNEL_GZIP || HAVE_KERNEL_BZIP2 || HAVE_KERNEL_LZMA
|
||||
depends on HAVE_KERNEL_GZIP || HAVE_KERNEL_BZIP2 || HAVE_KERNEL_LZMA || HAVE_KERNEL_LZO
|
||||
help
|
||||
The linux kernel is a kind of self-extracting executable.
|
||||
Several compression algorithms are available, which differ
|
||||
@@ -141,9 +144,8 @@ config KERNEL_GZIP
|
||||
bool "Gzip"
|
||||
depends on HAVE_KERNEL_GZIP
|
||||
help
|
||||
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.
|
||||
The old and tried gzip compression. It provides a good balance
|
||||
between compression ratio and decompression speed.
|
||||
|
||||
config KERNEL_BZIP2
|
||||
bool "Bzip2"
|
||||
@@ -164,6 +166,14 @@ config KERNEL_LZMA
|
||||
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
|
||||
|
Reference in New Issue
Block a user