Skip to content

Commit

Permalink
Revert "init/Kconfig: add option to disable kernel compression"
Browse files Browse the repository at this point in the history
This reverts commit 69f0554.

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: Pavel Roskin <[email protected]>
Cc: Christian Ruppert <[email protected]>
Cc: Andrew Morton <[email protected]>
Link: http://lkml.kernel.org/r/20131113113418.167b8ffd@IRBT4585
Signed-off-by: H. Peter Anvin <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
  • Loading branch information
H. Peter Anvin authored and torvalds committed Nov 17, 2013
1 parent 1213959 commit 2d3c627
Showing 1 changed file with 1 addition and 7 deletions.
8 changes: 1 addition & 7 deletions init/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down

0 comments on commit 2d3c627

Please sign in to comment.