aboutsummaryrefslogtreecommitdiff
path: root/init
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2013-11-14 21:43:47 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2013-11-17 11:17:36 -0800
commit2d3c627502f2a9b0a7de06a5a2df2365542a72c9 (patch)
tree57e1ccba1b743d8163f09573d1166cf51d1f8d2f /init
parent1213959d4ad2f523290d0d7c94f712edef63852c (diff)
downloadlinux-2d3c627502f2a9b0a7de06a5a2df2365542a72c9.tar.gz
Revert "init/Kconfig: add option to disable kernel compression"
This reverts commit 69f0554ec261fd686ac7fa1c598cc9eb27b83a80. 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 <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@IRBT4585 Signed-off-by: H. Peter Anvin <hpa@zytor.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'init')
-rw-r--r--init/Kconfig8
1 files changed, 1 insertions, 7 deletions
diff --git a/init/Kconfig b/init/Kconfig
index 2d60611c0609..3fc8a2f2fac4 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -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
@@ -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