Commit 2d3c6275 authored by H. Peter Anvin's avatar H. Peter Anvin Committed by Linus Torvalds

Revert "init/Kconfig: add option to disable kernel compression"

This reverts commit 69f0554e.

This patch breaks randconfig on at least the x86-64 architecture, and
most likely on others.  There is work underway to support uncompressed
kernels in a generic way, but it looks like it will amount to
rewriting the support from scratch; see the LKML thread in the Link:
for info.

Therefore, revert this change and wait for the fix.
Reported-by: default avatarPavel Roskin <proski@gnu.org>
Cc: Christian Ruppert <christian.ruppert@abilis.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Link: http://lkml.kernel.org/r/20131113113418.167b8ffd@IRBT4585Signed-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 1213959d
...@@ -118,6 +118,7 @@ config HAVE_KERNEL_LZ4 ...@@ -118,6 +118,7 @@ config HAVE_KERNEL_LZ4
choice choice
prompt "Kernel compression mode" prompt "Kernel compression mode"
default KERNEL_GZIP default KERNEL_GZIP
depends on HAVE_KERNEL_GZIP || HAVE_KERNEL_BZIP2 || HAVE_KERNEL_LZMA || HAVE_KERNEL_XZ || HAVE_KERNEL_LZO || HAVE_KERNEL_LZ4
help help
The linux kernel is a kind of self-extracting executable. The linux kernel is a kind of self-extracting executable.
Several compression algorithms are available, which differ Several compression algorithms are available, which differ
...@@ -136,13 +137,6 @@ choice ...@@ -136,13 +137,6 @@ 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 config KERNEL_GZIP
bool "Gzip" bool "Gzip"
depends on HAVE_KERNEL_GZIP depends on HAVE_KERNEL_GZIP
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment