From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751863Ab3KOQww (ORCPT ); Fri, 15 Nov 2013 11:52:52 -0500 Received: from mail.abilis.ch ([195.70.19.74]:25320 "EHLO mail.abilis.ch" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751178Ab3KOQwn (ORCPT ); Fri, 15 Nov 2013 11:52:43 -0500 From: Christian Ruppert To: "H. Peter Anvin" , Linus Torvalds Cc: Linux Kernel Mailing List , Pavel Roskin , Ingo Molnar , Thomas Gleixner , Christian Ruppert , Andrew Morton , Sam Ravnborg , Noam Camus , Joe Perches Subject: [PATCH] [FIX] init/Kconfig: fix option to disable kernel compression Date: Fri, 15 Nov 2013 17:51:07 +0100 Message-Id: <1384534267-14746-1-git-send-email-christian.ruppert@abilis.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1384494227-24029-1-git-send-email-hpa@zytor.com> References: <1384494227-24029-1-git-send-email-hpa@zytor.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- 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