Some architectures with self-decompressing kernel images did not compile with commit 69f0554ec261fd686ac7fa1c598cc9eb27b83a80 because they don't provide a non-decompression mechanism for uncompressed kernels.
Rectify this problem by allowing uncompressed kernels only for architectures which explicitly state they support them. Signed-off-by: Christian Ruppert <[email protected]> --- arch/arc/Kconfig | 2 ++ init/Kconfig | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/arch/arc/Kconfig b/arch/arc/Kconfig index 2ee0c9b..15f4c3d 100644 --- a/arch/arc/Kconfig +++ b/arch/arc/Kconfig @@ -21,6 +21,8 @@ config ARC select HAVE_ARCH_KGDB select HAVE_ARCH_TRACEHOOK select HAVE_IOREMAP_PROT + select HAVE_KERNEL_UNCOMPRESSED + select HAVE_KERNEL_GZIP select HAVE_KPROBES select HAVE_KRETPROBES select HAVE_MEMBLOCK diff --git a/init/Kconfig b/init/Kconfig index 5496f30..d4baf2e 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -97,6 +97,9 @@ config LOCALVERSION_AUTO which is done within the script "scripts/setlocalversion".) +config HAVE_KERNEL_UNCOMPRESSED + bool + config HAVE_KERNEL_GZIP bool @@ -118,6 +121,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 || HAVE_KERNEL_UNCOMPRESSED help The linux kernel is a kind of self-extracting executable. Several compression algorithms are available, which differ @@ -138,6 +142,7 @@ choice config KERNEL_UNCOMPRESSED bool "No compression" + depends on HAVE_KERNEL_UNCOMPRESSED help No compression at all. The kernel is huge but the compression and decompression times are zero. -- 1.8.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
