From: Christian Ruppert <christian.ruppert@abilis.com>
To: "H. Peter Anvin" <hpa@zytor.com>,
Linus Torvalds <torvalds@linux-foundation.org>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Pavel Roskin <proski@gnu.org>, Ingo Molnar <mingo@kernel.org>,
Thomas Gleixner <tglx@linutronix.de>,
Christian Ruppert <christian.ruppert@abilis.com>,
Andrew Morton <akpm@linux-foundation.org>,
Sam Ravnborg <sam@ravnborg.org>, Noam Camus <noamc@ezchip.com>,
Joe Perches <joe@perches.com>
Subject: [PATCH] [FIX] init/Kconfig: fix option to disable kernel compression
Date: Fri, 15 Nov 2013 17:51:07 +0100 [thread overview]
Message-ID: <1384534267-14746-1-git-send-email-christian.ruppert@abilis.com> (raw)
In-Reply-To: <1384494227-24029-1-git-send-email-hpa@zytor.com>
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 <christian.ruppert@abilis.com>
---
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
next prev parent reply other threads:[~2013-11-15 16:52 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-11-15 5:43 [PATCH] Revert "init/Kconfig: add option to disable kernel compression" H. Peter Anvin
2013-11-15 16:51 ` Christian Ruppert [this message]
2013-11-16 9:42 ` [PATCH] [FIX] init/Kconfig: fix option to disable kernel compression Vineet Gupta
2013-11-18 9:48 ` Christian Ruppert
2013-11-18 9:51 ` [PATCH 1/2] init/Kconfig: add " Christian Ruppert
2013-11-18 9:51 ` [PATCH 2/2] x86: Add support for uncompressed kernel images Christian Ruppert
2013-11-18 11:25 ` Borislav Petkov
2013-11-18 13:48 ` [PATCH 2/2 v2] " Christian Ruppert
2013-12-16 8:59 ` Christian Ruppert
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1384534267-14746-1-git-send-email-christian.ruppert@abilis.com \
--to=christian.ruppert@abilis.com \
--cc=akpm@linux-foundation.org \
--cc=hpa@zytor.com \
--cc=joe@perches.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=noamc@ezchip.com \
--cc=proski@gnu.org \
--cc=sam@ravnborg.org \
--cc=tglx@linutronix.de \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®