Subject: + init-kconfig-fix-option-to-disable-kernel-compression.patch added to -mm tree
To: christian.ruppert@xxxxxxxxxx,hpa@xxxxxxxxx
From: akpm@xxxxxxxxxxxxxxxxxxxx
Date: Fri, 15 Nov 2013 14:31:10 -0800
The patch titled
Subject: init/Kconfig: fix option to disable kernel compression
has been added to the -mm tree. Its filename is
init-kconfig-fix-option-to-disable-kernel-compression.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/init-kconfig-fix-option-to-disable-kernel-compression.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/init-kconfig-fix-option-to-disable-kernel-compression.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Christian Ruppert <christian.ruppert@xxxxxxxxxx>
Subject: init/Kconfig: fix option to disable kernel compression
Some architectures with self-decompressing kernel images did not compile
with commit 69f0554ec261fd68 ("init/Kconfig: add option to disable kernel
compression") 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@xxxxxxxxxx>
Cc: "H. Peter Anvin" <hpa@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
arch/arc/Kconfig | 2 ++
init/Kconfig | 5 +++++
2 files changed, 7 insertions(+)
diff -puN arch/arc/Kconfig~init-kconfig-fix-option-to-disable-kernel-compression arch/arc/Kconfig
--- a/arch/arc/Kconfig~init-kconfig-fix-option-to-disable-kernel-compression
+++ a/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 -puN init/Kconfig~init-kconfig-fix-option-to-disable-kernel-compression init/Kconfig
--- a/init/Kconfig~init-kconfig-fix-option-to-disable-kernel-compression
+++ a/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.
_
Patches currently in -mm which might be from christian.ruppert@xxxxxxxxxx are
origin.patch
init-kconfig-fix-option-to-disable-kernel-compression.patch
linux-next.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
