* [PATCH V2 6/8] lzma: Make lzma available to non initramfs/initrd code @ 2009-12-11 1:34 Phillip Lougher 2010-01-06 22:04 ` Andrew Morton 0 siblings, 1 reply; 10+ messages in thread From: Phillip Lougher @ 2009-12-11 1:34 UTC (permalink / raw) To: akpm, linux-embedded, linux-fsdevel, linux-kernel, phillip.lougher, tim.bird Add a config option DECOMPRESS_LZMA_NEEDED which allows subsystems to specify they need the unlzma code. Normally decompress_unlzma.c is compiled with __init and unlzma is not exported to modules. Move INIT definition into separate header files for bzip2/lzma/inflate so it can be defined differently for each decompressor. Signed-off-by: Phillip Lougher <phillip@lougher.demon.co.uk> --- include/linux/decompress/bunzip2_mm.h | 12 ++++++++++++ include/linux/decompress/inflate_mm.h | 12 ++++++++++++ include/linux/decompress/mm.h | 3 --- include/linux/decompress/unlzma_mm.h | 20 ++++++++++++++++++++ lib/Kconfig | 3 +++ lib/decompress_bunzip2.c | 1 + lib/decompress_inflate.c | 1 + lib/decompress_unlzma.c | 6 +++++- 8 files changed, 54 insertions(+), 4 deletions(-) create mode 100644 include/linux/decompress/bunzip2_mm.h create mode 100644 include/linux/decompress/inflate_mm.h create mode 100644 include/linux/decompress/unlzma_mm.h diff --git a/include/linux/decompress/bunzip2_mm.h b/include/linux/decompress/bunzip2_mm.h new file mode 100644 index 0000000..cac6fef --- /dev/null +++ b/include/linux/decompress/bunzip2_mm.h @@ -0,0 +1,12 @@ +#ifndef BUNZIP2_MM_H +#define BUNZIP2_MM_H + +#ifdef STATIC +/* Code active when included from pre-boot environment: */ +#define INIT +#else +/* Compile for initramfs/initrd code only */ +#define INIT __init +#endif + +#endif diff --git a/include/linux/decompress/inflate_mm.h b/include/linux/decompress/inflate_mm.h new file mode 100644 index 0000000..ca4a2ae --- /dev/null +++ b/include/linux/decompress/inflate_mm.h @@ -0,0 +1,12 @@ +#ifndef INFLATE_MM_H +#define INFLATE_MM_H + +#ifdef STATIC +/* Code active when included from pre-boot environment: */ +#define INIT +#else +/* Compile for initramfs/initrd code only */ +#define INIT __init +#endif + +#endif diff --git a/include/linux/decompress/mm.h b/include/linux/decompress/mm.h index 12ff8c3..80f5ba4 100644 --- a/include/linux/decompress/mm.h +++ b/include/linux/decompress/mm.h @@ -53,8 +53,6 @@ static void free(void *where) #define set_error_fn(x) -#define INIT - #else /* STATIC */ /* Code active when compiled standalone for use when loading ramdisk: */ @@ -77,7 +75,6 @@ static void free(void *where) static void(*error)(char *m); #define set_error_fn(x) error = x; -#define INIT __init #define STATIC #include <linux/init.h> diff --git a/include/linux/decompress/unlzma_mm.h b/include/linux/decompress/unlzma_mm.h new file mode 100644 index 0000000..859287e --- /dev/null +++ b/include/linux/decompress/unlzma_mm.h @@ -0,0 +1,20 @@ +#ifndef UNLZMA_MM_H +#define UNLZMA_MM_H + +#ifdef STATIC + +/* Code active when included from pre-boot environment: */ +#define INIT + +#elif defined(CONFIG_DECOMPRESS_LZMA_NEEDED) + +/* Make it available to non initramfs/initrd code */ +#define INIT +#include <linux/module.h> +#else + +/* Compile for initramfs/initrd code only */ +#define INIT __init +#endif + +#endif diff --git a/lib/Kconfig b/lib/Kconfig index bb1326d..25e7f28 100644 --- a/lib/Kconfig +++ b/lib/Kconfig @@ -117,6 +117,9 @@ config DECOMPRESS_BZIP2 config DECOMPRESS_LZMA tristate +config DECOMPRESS_LZMA_NEEDED + boolean + # # Generic allocator support is selected if needed # diff --git a/lib/decompress_bunzip2.c b/lib/decompress_bunzip2.c index 600f473..6eb6433 100644 --- a/lib/decompress_bunzip2.c +++ b/lib/decompress_bunzip2.c @@ -52,6 +52,7 @@ #include <linux/slab.h> #endif /* STATIC */ +#include <linux/decompress/bunzip2_mm.h> #include <linux/decompress/mm.h> #ifndef INT_MAX diff --git a/lib/decompress_inflate.c b/lib/decompress_inflate.c index fc686c7..cb6bcab 100644 --- a/lib/decompress_inflate.c +++ b/lib/decompress_inflate.c @@ -23,6 +23,7 @@ #endif /* STATIC */ +#include <linux/decompress/inflate_mm.h> #include <linux/decompress/mm.h> #define GZIP_IOBUF_SIZE (16*1024) diff --git a/lib/decompress_unlzma.c b/lib/decompress_unlzma.c index ca82fde..a614b26 100644 --- a/lib/decompress_unlzma.c +++ b/lib/decompress_unlzma.c @@ -36,6 +36,7 @@ #include <linux/slab.h> #endif /* STATIC */ +#include <linux/decompress/unlzma_mm.h> #include <linux/decompress/mm.h> #define MIN(a, b) (((a) < (b)) ? (a) : (b)) @@ -531,7 +532,7 @@ static inline void INIT process_bit1(struct writer *wr, struct rc *rc, -STATIC inline int INIT unlzma(unsigned char *buf, int in_len, +STATIC int INIT unlzma(unsigned char *buf, int in_len, int(*fill)(void*, unsigned int), int(*flush)(void*, unsigned int), unsigned char *output, @@ -652,6 +653,9 @@ exit_1: exit_0: return ret; } +#if defined(CONFIG_DECOMPRESS_LZMA_NEEDED) && !defined(PREBOOT) +EXPORT_SYMBOL(unlzma); +#endif #ifdef PREBOOT STATIC int INIT decompress(unsigned char *buf, int in_len, -- 1.6.3.3 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH V2 6/8] lzma: Make lzma available to non initramfs/initrd code 2009-12-11 1:34 [PATCH V2 6/8] lzma: Make lzma available to non initramfs/initrd code Phillip Lougher @ 2010-01-06 22:04 ` Andrew Morton 2010-01-06 22:45 ` Albin Tonnerre ` (2 more replies) 0 siblings, 3 replies; 10+ messages in thread From: Andrew Morton @ 2010-01-06 22:04 UTC (permalink / raw) To: Phillip Lougher Cc: linux-embedded, linux-fsdevel, linux-kernel, phillip.lougher, tim.bird, Stephen Rothwell, Albin Tonnerre On Fri, 11 Dec 2009 01:34:08 +0000 Phillip Lougher <phillip@lougher.demon.co.uk> wrote: > Add a config option DECOMPRESS_LZMA_NEEDED which allows subsystems to > specify they need the unlzma code. Normally decompress_unlzma.c is > compiled with __init and unlzma is not exported to modules. > > Move INIT definition into separate header files for bzip2/lzma/inflate > so it can be defined differently for each decompressor. > This patch (which is in linux-next) breaks lib-add-support-for-lzo-compressed-kernels.patch, below. The definition of INIT is no longer available in lib/decompress_unlzo.c, and lib/decompress_unlzo.c: In function 'unlzo': lib/decompress_unlzo.c:106: error: 'error' undeclared (first use in this function) lib/decompress_unlzo.c:106: error: (Each undeclared identifier is reported only once lib/decompress_unlzo.c:106: error: for each function it appears in.) lib/decompress_unlzo.c:111: error: implicit declaration of function 'error' I'm planning on merging zlib-optimize-inffast-when-copying-direct-from-output.patch lib-add-support-for-lzo-compressed-kernels.patch arm-add-support-for-lzo-compressed-kernels.patch x86-add-support-for-lzo-compressed-kernels.patch add-lzo-compression-support-for-initramfs-and-old-style-initrd.patch into 2.6.33. I don't immediately remember why I decided that - perhaps because the patches did arrive in time for .33, but got stalled because people were screwing around in other trees. So if I go ahead with that merge, linux-next will need fixing. And I didn't get down and work what the appropriate fix is, and I don't want to break linux-next in serious ways. So what to do? I guess I could go ahead with the mainline merge, and Stephen drops <whatever that tree was> from linux-next until it has been fixed up? If we decide to hold the above five patches off until 2.6.34 then they'll need to be fixed up to work against linux-next, and they will be dependent upon your patch series. From: Albin Tonnerre <albin.tonnerre@free-electrons.com> This patch series adds generic support for creating and extracting LZO-compressed kernel images, as well as support for using such images on the x86 and ARM architectures, and support for creating and using LZO-compressed initrd and initramfs images. Russell King said: : Testing on a Cortex A9 model: : - lzo decompressor is 65% of the time gzip takes to decompress a kernel : - lzo kernel is 9% larger than a gzip kernel : : which I'm happy to say confirms your figures when comparing the two. : : However, when comparing your new gzip code to the old gzip code: : - new is 99% of the size of the old code : - new takes 42% of the time to decompress than the old code : : What this means is that for a proper comparison, the results get even better: : - lzo is 7.5% larger than the old gzip'd kernel image : - lzo takes 28% of the time that the old gzip code took : : So the expense seems definitely worth the effort. The only reason I : can think of ever using gzip would be if you needed the additional : compression (eg, because you have limited flash to store the image.) : : I would argue that the default for ARM should therefore be LZO. This patch: The lzo compressor is worse than gzip at compression, but faster at extraction. Here are some figures for an ARM board I'm working on: Uncompressed size: 3.24Mo gzip 1.61Mo 0.72s lzo 1.75Mo 0.48s So for a compression ratio that is still relatively close to gzip, it's much faster to extract, at least in that case. This part contains: - Makefile routine to support lzo compression - Fixes to the existing lzo compressor so that it can be used in compressed kernels - wrapper around the existing lzo1x_decompress, as it only extracts one block at a time, while we need to extract a whole file here - config dialog for kernel compression [akpm@linux-foundation.org: coding-style fixes] [akpm@linux-foundation.org: cleanup] Signed-off-by: Albin Tonnerre <albin.tonnerre@free-electrons.com> Tested-by: Wu Zhangjin <wuzhangjin@gmail.com> Acked-by: "H. Peter Anvin" <hpa@zytor.com> Cc: Ingo Molnar <mingo@elte.hu> Cc: Thomas Gleixner <tglx@linutronix.de> Tested-by: Russell King <rmk@arm.linux.org.uk> Acked-by: Russell King <rmk@arm.linux.org.uk> Cc: Ralf Baechle <ralf@linux-mips.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> --- include/linux/decompress/unlzo.h | 10 + init/Kconfig | 18 +- lib/decompress_unlzo.c | 209 +++++++++++++++++++++++++++++ lib/lzo/lzo1x_decompress.c | 9 - scripts/Makefile.lib | 5 5 files changed, 244 insertions(+), 7 deletions(-) diff -puN /dev/null include/linux/decompress/unlzo.h --- /dev/null +++ a/include/linux/decompress/unlzo.h @@ -0,0 +1,10 @@ +#ifndef DECOMPRESS_UNLZO_H +#define DECOMPRESS_UNLZO_H + +int unlzo(unsigned char *inbuf, int len, + int(*fill)(void*, unsigned int), + int(*flush)(void*, unsigned int), + unsigned char *output, + int *pos, + void(*error)(char *x)); +#endif diff -puN init/Kconfig~lib-add-support-for-lzo-compressed-kernels init/Kconfig --- a/init/Kconfig~lib-add-support-for-lzo-compressed-kernels +++ a/init/Kconfig @@ -123,10 +123,13 @@ config HAVE_KERNEL_BZIP2 config HAVE_KERNEL_LZMA bool +config HAVE_KERNEL_LZO + bool + choice prompt "Kernel compression mode" default KERNEL_GZIP - depends on HAVE_KERNEL_GZIP || HAVE_KERNEL_BZIP2 || HAVE_KERNEL_LZMA + depends on HAVE_KERNEL_GZIP || HAVE_KERNEL_BZIP2 || HAVE_KERNEL_LZMA || HAVE_KERNEL_LZO help The linux kernel is a kind of self-extracting executable. Several compression algorithms are available, which differ @@ -149,9 +152,8 @@ config KERNEL_GZIP bool "Gzip" depends on HAVE_KERNEL_GZIP help - The old and tried gzip compression. Its compression ratio is - the poorest among the 3 choices; however its speed (both - compression and decompression) is the fastest. + The old and tried gzip compression. It provides a good balance + between compression ratio and decompression speed. config KERNEL_BZIP2 bool "Bzip2" @@ -172,6 +174,14 @@ config KERNEL_LZMA two. Compression is slowest. The kernel size is about 33% smaller with LZMA in comparison to gzip. +config KERNEL_LZO + bool "LZO" + depends on HAVE_KERNEL_LZO + help + Its compression ratio is the poorest among the 4. The kernel + size is about about 10% bigger than gzip; however its speed + (both compression and decompression) is the fastest. + endchoice config SWAP diff -puN /dev/null lib/decompress_unlzo.c --- /dev/null +++ a/lib/decompress_unlzo.c @@ -0,0 +1,209 @@ +/* + * LZO decompressor for the Linux kernel. Code borrowed from the lzo + * implementation by Markus Franz Xaver Johannes Oberhumer. + * + * Linux kernel adaptation: + * Copyright (C) 2009 + * Albin Tonnerre, Free Electrons <albin.tonnerre@free-electrons.com> + * + * Original code: + * Copyright (C) 1996-2005 Markus Franz Xaver Johannes Oberhumer + * All Rights Reserved. + * + * lzop and the LZO library are free software; you can redistribute them + * and/or modify them under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; see the file COPYING. + * If not, write to the Free Software Foundation, Inc., + * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * + * Markus F.X.J. Oberhumer + * <markus@oberhumer.com> + * http://www.oberhumer.com/opensource/lzop/ + */ + +#ifdef STATIC +#include "lzo/lzo1x_decompress.c" +#else +#include <linux/slab.h> +#include <linux/decompress/unlzo.h> +#endif + +#include <linux/types.h> +#include <linux/lzo.h> +#include <linux/decompress/mm.h> + +#include <linux/compiler.h> +#include <asm/unaligned.h> + +static const unsigned char lzop_magic[] = { + 0x89, 0x4c, 0x5a, 0x4f, 0x00, 0x0d, 0x0a, 0x1a, 0x0a }; + +#define LZO_BLOCK_SIZE (256*1024l) +#define HEADER_HAS_FILTER 0x00000800L + +STATIC inline int INIT parse_header(u8 *input, u8 *skip) +{ + int l; + u8 *parse = input; + u8 level = 0; + u16 version; + + /* read magic: 9 first bits */ + for (l = 0; l < 9; l++) { + if (*parse++ != lzop_magic[l]) + return 0; + } + /* get version (2bytes), skip library version (2), + * 'need to be extracted' version (2) and + * method (1) */ + version = get_unaligned_be16(parse); + parse += 7; + if (version >= 0x0940) + level = *parse++; + if (get_unaligned_be32(parse) & HEADER_HAS_FILTER) + parse += 8; /* flags + filter info */ + else + parse += 4; /* flags */ + + /* skip mode and mtime_low */ + parse += 8; + if (version >= 0x0940) + parse += 4; /* skip mtime_high */ + + l = *parse++; + /* don't care about the file name, and skip checksum */ + parse += l + 4; + + *skip = parse - input; + return 1; +} + +STATIC inline int INIT unlzo(u8 *input, int in_len, + int (*fill) (void *, unsigned int), + int (*flush) (void *, unsigned int), + u8 *output, int *posp, + void (*error_fn) (char *x)) +{ + u8 skip = 0, r = 0; + u32 src_len, dst_len; + size_t tmp; + u8 *in_buf, *in_buf_save, *out_buf; + int obytes_processed = 0; + + set_error_fn(error_fn); + + if (output) { + out_buf = output; + } else if (!flush) { + error("NULL output pointer and no flush function provided"); + goto exit; + } else { + out_buf = malloc(LZO_BLOCK_SIZE); + if (!out_buf) { + error("Could not allocate output buffer"); + goto exit; + } + } + + if (input && fill) { + error("Both input pointer and fill function provided, don't know what to do"); + goto exit_1; + } else if (input) { + in_buf = input; + } else if (!fill || !posp) { + error("NULL input pointer and missing position pointer or fill function"); + goto exit_1; + } else { + in_buf = malloc(lzo1x_worst_compress(LZO_BLOCK_SIZE)); + if (!in_buf) { + error("Could not allocate input buffer"); + goto exit_1; + } + } + in_buf_save = in_buf; + + if (posp) + *posp = 0; + + if (fill) + fill(in_buf, lzo1x_worst_compress(LZO_BLOCK_SIZE)); + + if (!parse_header(input, &skip)) { + error("invalid header"); + goto exit_2; + } + in_buf += skip; + + if (posp) + *posp = skip; + + for (;;) { + /* read uncompressed block size */ + dst_len = get_unaligned_be32(in_buf); + in_buf += 4; + + /* exit if last block */ + if (dst_len == 0) { + if (posp) + *posp += 4; + break; + } + + if (dst_len > LZO_BLOCK_SIZE) { + error("dest len longer than block size"); + goto exit_2; + } + + /* read compressed block size, and skip block checksum info */ + src_len = get_unaligned_be32(in_buf); + in_buf += 8; + + if (src_len <= 0 || src_len > dst_len) { + error("file corrupted"); + goto exit_2; + } + + /* decompress */ + tmp = dst_len; + r = lzo1x_decompress_safe((u8 *) in_buf, src_len, + out_buf, &tmp); + + if (r != LZO_E_OK || dst_len != tmp) { + error("Compressed data violation"); + goto exit_2; + } + + obytes_processed += dst_len; + if (flush) + flush(out_buf, dst_len); + if (output) + out_buf += dst_len; + if (posp) + *posp += src_len + 12; + if (fill) { + in_buf = in_buf_save; + fill(in_buf, lzo1x_worst_compress(LZO_BLOCK_SIZE)); + } else + in_buf += src_len; + } + +exit_2: + if (!input) + free(in_buf); +exit_1: + if (!output) + free(out_buf); +exit: + return obytes_processed; +} + +#define decompress unlzo diff -puN lib/lzo/lzo1x_decompress.c~lib-add-support-for-lzo-compressed-kernels lib/lzo/lzo1x_decompress.c --- a/lib/lzo/lzo1x_decompress.c~lib-add-support-for-lzo-compressed-kernels +++ a/lib/lzo/lzo1x_decompress.c @@ -11,11 +11,13 @@ * Richard Purdie <rpurdie@openedhand.com> */ +#ifndef STATIC #include <linux/module.h> #include <linux/kernel.h> -#include <linux/lzo.h> -#include <asm/byteorder.h> +#endif + #include <asm/unaligned.h> +#include <linux/lzo.h> #include "lzodefs.h" #define HAVE_IP(x, ip_end, ip) ((size_t)(ip_end - ip) < (x)) @@ -244,9 +246,10 @@ lookbehind_overrun: *out_len = op - out; return LZO_E_LOOKBEHIND_OVERRUN; } - +#ifndef STATIC EXPORT_SYMBOL_GPL(lzo1x_decompress_safe); MODULE_LICENSE("GPL"); MODULE_DESCRIPTION("LZO1X Decompressor"); +#endif diff -puN scripts/Makefile.lib~lib-add-support-for-lzo-compressed-kernels scripts/Makefile.lib --- a/scripts/Makefile.lib~lib-add-support-for-lzo-compressed-kernels +++ a/scripts/Makefile.lib @@ -235,3 +235,8 @@ quiet_cmd_lzma = LZMA $@ cmd_lzma = (cat $(filter-out FORCE,$^) | \ lzma -9 && $(call size_append, $(filter-out FORCE,$^))) > $@ || \ (rm -f $@ ; false) + +quiet_cmd_lzo = LZO $@ +cmd_lzo = (cat $(filter-out FORCE,$^) | \ + lzop -9 && $(call size_append, $(filter-out FORCE,$^))) > $@ || \ + (rm -f $@ ; false) _ ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH V2 6/8] lzma: Make lzma available to non initramfs/initrd code 2010-01-06 22:04 ` Andrew Morton @ 2010-01-06 22:45 ` Albin Tonnerre 2010-01-07 0:04 ` Stephen Rothwell 2010-01-07 0:20 ` Phillip Lougher 2 siblings, 0 replies; 10+ messages in thread From: Albin Tonnerre @ 2010-01-06 22:45 UTC (permalink / raw) To: Andrew Morton Cc: Phillip Lougher, linux-embedded, linux-fsdevel, linux-kernel, phillip.lougher, tim.bird, Stephen Rothwell On Wed, 06 Jan 2010 14:04 -0800, Andrew Morton wrote : > On Fri, 11 Dec 2009 01:34:08 +0000 > Phillip Lougher <phillip@lougher.demon.co.uk> wrote: > > > Add a config option DECOMPRESS_LZMA_NEEDED which allows subsystems to > > specify they need the unlzma code. Normally decompress_unlzma.c is > > compiled with __init and unlzma is not exported to modules. > > > > Move INIT definition into separate header files for bzip2/lzma/inflate > > so it can be defined differently for each decompressor. > > > > This patch (which is in linux-next) breaks > lib-add-support-for-lzo-compressed-kernels.patch, below. The > definition of INIT is no longer available in lib/decompress_unlzo.c, and > > lib/decompress_unlzo.c: In function 'unlzo': > lib/decompress_unlzo.c:106: error: 'error' undeclared (first use in this function) > lib/decompress_unlzo.c:106: error: (Each undeclared identifier is reported only once > lib/decompress_unlzo.c:106: error: for each function it appears in.) > lib/decompress_unlzo.c:111: error: implicit declaration of function 'error' > > > I'm planning on merging > > zlib-optimize-inffast-when-copying-direct-from-output.patch > lib-add-support-for-lzo-compressed-kernels.patch > arm-add-support-for-lzo-compressed-kernels.patch > x86-add-support-for-lzo-compressed-kernels.patch > add-lzo-compression-support-for-initramfs-and-old-style-initrd.patch > > into 2.6.33. I don't immediately remember why I decided that - perhaps > because the patches did arrive in time for .33, but got stalled because > people were screwing around in other trees. > > So if I go ahead with that merge, linux-next will need fixing. And I > didn't get down and work what the appropriate fix is, and I don't want > to break linux-next in serious ways. > > > So what to do? I guess I could go ahead with the mainline merge, and > Stephen drops <whatever that tree was> from linux-next until it has > been fixed up? I'd go for that one, although I'm obviously biaised. IMHO the linux-next fix should be easy enough not to postpone the above five patches until 2.6.34. Regards, -- Albin Tonnerre, Free Electrons Kernel, drivers and embedded Linux development, consulting, training and support. http://free-electrons.com ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH V2 6/8] lzma: Make lzma available to non initramfs/initrd code 2010-01-06 22:04 ` Andrew Morton 2010-01-06 22:45 ` Albin Tonnerre @ 2010-01-07 0:04 ` Stephen Rothwell 2010-01-07 0:20 ` Phillip Lougher 2 siblings, 0 replies; 10+ messages in thread From: Stephen Rothwell @ 2010-01-07 0:04 UTC (permalink / raw) To: Andrew Morton Cc: Phillip Lougher, linux-embedded, linux-fsdevel, linux-kernel, phillip.lougher, tim.bird, Albin Tonnerre [-- Attachment #1: Type: text/plain, Size: 730 bytes --] Hi Andrew, On Wed, 6 Jan 2010 14:04:09 -0800 Andrew Morton <akpm@linux-foundation.org> wrote: > > So if I go ahead with that merge, linux-next will need fixing. And I > didn't get down and work what the appropriate fix is, and I don't want > to break linux-next in serious ways. Why not, everyone else does :-) > So what to do? I guess I could go ahead with the mainline merge, and > Stephen drops <whatever that tree was> from linux-next until it has > been fixed up? Just do the merge ... I will just need to drop the squashfs tree until they do a merge/rebase with Linus' tree and fix it all up. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ [-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --] ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH V2 6/8] lzma: Make lzma available to non initramfs/initrd code 2010-01-06 22:04 ` Andrew Morton 2010-01-06 22:45 ` Albin Tonnerre 2010-01-07 0:04 ` Stephen Rothwell @ 2010-01-07 0:20 ` Phillip Lougher 2010-01-07 0:31 ` Andrew Morton 2 siblings, 1 reply; 10+ messages in thread From: Phillip Lougher @ 2010-01-07 0:20 UTC (permalink / raw) To: Andrew Morton Cc: linux-embedded, linux-fsdevel, linux-kernel, phillip.lougher, tim.bird, Stephen Rothwell, Albin Tonnerre Andrew Morton wrote: > So what to do? I guess I could go ahead with the mainline merge, and > Stephen drops <whatever that tree was> from linux-next until it has > been fixed up? > Yes, I'm happy with that. The following patch is the necessary fix that needs to go into linux-next when you've gone ahead with the mainline merge of the lib-add-support-for-lzo-compressed-kernels.patch. Once I know the mainline merge has gone ahead, I can add this to my linux-next tree. Phillip From 1cf6d32e1427398368ff189aece68aa533092e98 Mon Sep 17 00:00:00 2001 From: Phillip Lougher <phillip@lougher.demon.co.uk> Date: Wed, 6 Jan 2010 23:50:12 +0000 Subject: [PATCH] lzo: Fix-up add support for lzo compressed kernels patch The add support for lzo compressed kernels patch relies on INIT and error definitions which have been moved to separate xxx_mm.h files for each decompressor. This patch adds a unlzo_mm.h file which supplies these definitions. Signed-off-by: Phillip Lougher <phillip@lougher.demon.co.uk> --- include/linux/decompress/unlzo_mm.h | 13 +++++++++++++ lib/decompress_unlzo.c | 1 + 2 files changed, 14 insertions(+), 0 deletions(-) create mode 100644 include/linux/decompress/unlzo_mm.h diff --git a/include/linux/decompress/unlzo_mm.h b/include/linux/decompress/unlzo_mm.h new file mode 100644 index 0000000..27fe0ab --- /dev/null +++ b/include/linux/decompress/unlzo_mm.h @@ -0,0 +1,13 @@ +#ifndef UNLZO_MM_H +#define UNLZO_MM_H + +#ifdef STATIC +/* Code active when included from pre-boot environment: */ +#define INIT +#else +/* Compile for initramfs/initrd code only */ +#define INIT __init +static void(*error)(char *m); +#endif + +#endif diff --git a/lib/decompress_unlzo.c b/lib/decompress_unlzo.c index db521f4..edd82c3 100644 --- a/lib/decompress_unlzo.c +++ b/lib/decompress_unlzo.c @@ -39,6 +39,7 @@ #include <linux/types.h> #include <linux/lzo.h> +#include <linux/decompress/unlzo_mm.h> #include <linux/decompress/mm.h> #include <linux/compiler.h> -- 1.6.3.3 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH V2 6/8] lzma: Make lzma available to non initramfs/initrd code 2010-01-07 0:20 ` Phillip Lougher @ 2010-01-07 0:31 ` Andrew Morton 2010-01-07 0:37 ` Phillip Lougher 0 siblings, 1 reply; 10+ messages in thread From: Andrew Morton @ 2010-01-07 0:31 UTC (permalink / raw) To: Phillip Lougher Cc: linux-embedded, linux-fsdevel, linux-kernel, phillip.lougher, tim.bird, Stephen Rothwell, Albin Tonnerre On Thu, 07 Jan 2010 00:20:24 +0000 Phillip Lougher <phillip@lougher.demon.co.uk> wrote: > Andrew Morton wrote: > > > So what to do? I guess I could go ahead with the mainline merge, and > > Stephen drops <whatever that tree was> from linux-next until it has > > been fixed up? > > > > Yes, I'm happy with that. The following patch is the necessary fix > that needs to go into linux-next when you've gone ahead with the > mainline merge of the lib-add-support-for-lzo-compressed-kernels.patch. ooh, goody, thanks. > diff --git a/lib/decompress_unlzo.c b/lib/decompress_unlzo.c > index db521f4..edd82c3 100644 > --- a/lib/decompress_unlzo.c > +++ b/lib/decompress_unlzo.c > @@ -39,6 +39,7 @@ > > #include <linux/types.h> > #include <linux/lzo.h> > +#include <linux/decompress/unlzo_mm.h> > #include <linux/decompress/mm.h> > > #include <linux/compiler.h> Your email client is doing space-stuffing. ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH V2 6/8] lzma: Make lzma available to non initramfs/initrd code 2010-01-07 0:31 ` Andrew Morton @ 2010-01-07 0:37 ` Phillip Lougher 2010-01-07 7:43 ` [PATCH V2 6/8] lzma: Make lzma ... thunderbird ok Hein_Tibosch 0 siblings, 1 reply; 10+ messages in thread From: Phillip Lougher @ 2010-01-07 0:37 UTC (permalink / raw) To: Andrew Morton Cc: Phillip Lougher, linux-embedded, linux-fsdevel, linux-kernel, tim.bird, Stephen Rothwell, Albin Tonnerre On Thu, Jan 7, 2010 at 12:31 AM, Andrew Morton <akpm@linux-foundation.org> wrote: > > Your email client is doing space-stuffing. > Sorry, I was worried it might do that - the curse of Thunderbird. I normally use a really dumb client like mailx to send patches, but I obviously didn't have the email thread under mailx to do that. If you want, I can resend the patch using my favourite dumb client. Phillip ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH V2 6/8] lzma: Make lzma ... thunderbird ok 2010-01-07 0:37 ` Phillip Lougher @ 2010-01-07 7:43 ` Hein_Tibosch 2010-01-07 17:26 ` Marco Stornelli 0 siblings, 1 reply; 10+ messages in thread From: Hein_Tibosch @ 2010-01-07 7:43 UTC (permalink / raw) To: Phillip Lougher; +Cc: linux-embedded On 7-1-2010 08:37, Phillip Lougher wrote: > Sorry, I was worried it might do that - the curse of Thunderbird. I > normally use a > really dumb client like mailx to send patches, but I obviously didn't have the > email thread under mailx to do that. > Thunderbird: not a real curse for patches. Try the following: Tools -> Options -> Advanced -> General -> Config Editor mailnews.send_plaintext_flowed user boolean false mailnews.display.disable_flowed_support user boolean true mailnews.wraplength user integer 512 And see this patch below: --- diff --git a/thunderbird b/thunderbird +++ --- if (using_thunderbird) { you can send patches safely } --- Hein ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH V2 6/8] lzma: Make lzma ... thunderbird ok 2010-01-07 7:43 ` [PATCH V2 6/8] lzma: Make lzma ... thunderbird ok Hein_Tibosch @ 2010-01-07 17:26 ` Marco Stornelli 0 siblings, 0 replies; 10+ messages in thread From: Marco Stornelli @ 2010-01-07 17:26 UTC (permalink / raw) To: Hein_Tibosch; +Cc: Phillip Lougher, linux-embedded Il 07/01/2010 08:43, Hein_Tibosch ha scritto: > On 7-1-2010 08:37, Phillip Lougher wrote: >> Sorry, I was worried it might do that - the curse of Thunderbird. I >> normally use a >> really dumb client like mailx to send patches, but I obviously didn't have the >> email thread under mailx to do that. >> > Thunderbird: not a real curse for patches. Try the following: > > Tools -> Options -> Advanced -> General -> Config Editor > > mailnews.send_plaintext_flowed user boolean false > mailnews.display.disable_flowed_support user boolean true > mailnews.wraplength user integer 512 > > And see this patch below: > > --- > diff --git a/thunderbird b/thunderbird > +++ > --- > if (using_thunderbird) { > you can send patches safely > } > --- > > Hein > And with pasteCode and Toggle Word Wrap extensions it is even more easier ;) Marco ^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH V2 6/8] lzma: Make lzma available to non initramfs/initrd code @ 2010-01-07 0:49 Phillip Lougher 0 siblings, 0 replies; 10+ messages in thread From: Phillip Lougher @ 2010-01-07 0:49 UTC (permalink / raw) To: albin.tonnerre, sfr, linux-kernel, linux-fsdevel, linux-embedded, akpm Fix up patch resend using a nice and dumb email client. If I'm lucky, email readers may even get the threading right :-) Phillip From 1cf6d32e1427398368ff189aece68aa533092e98 Mon Sep 17 00:00:00 2001 From: Phillip Lougher <phillip@lougher.demon.co.uk> Date: Wed, 6 Jan 2010 23:50:12 +0000 Subject: [PATCH] lzo: Fix-up add support for lzo compressed kernels patch The add support for lzo compressed kernels patch relies on INIT and error definitions which have been moved to separate xxx_mm.h files for each decompressor. This patch adds a unlzo_mm.h file which supplies these definitions. Signed-off-by: Phillip Lougher <phillip@lougher.demon.co.uk> --- include/linux/decompress/unlzo_mm.h | 13 +++++++++++++ lib/decompress_unlzo.c | 1 + 2 files changed, 14 insertions(+), 0 deletions(-) create mode 100644 include/linux/decompress/unlzo_mm.h diff --git a/include/linux/decompress/unlzo_mm.h b/include/linux/decompress/unlzo_mm.h new file mode 100644 index 0000000..27fe0ab --- /dev/null +++ b/include/linux/decompress/unlzo_mm.h @@ -0,0 +1,13 @@ +#ifndef UNLZO_MM_H +#define UNLZO_MM_H + +#ifdef STATIC +/* Code active when included from pre-boot environment: */ +#define INIT +#else +/* Compile for initramfs/initrd code only */ +#define INIT __init +static void(*error)(char *m); +#endif + +#endif diff --git a/lib/decompress_unlzo.c b/lib/decompress_unlzo.c index db521f4..edd82c3 100644 --- a/lib/decompress_unlzo.c +++ b/lib/decompress_unlzo.c @@ -39,6 +39,7 @@ #include <linux/types.h> #include <linux/lzo.h> +#include <linux/decompress/unlzo_mm.h> #include <linux/decompress/mm.h> #include <linux/compiler.h> -- 1.6.3.3 ^ permalink raw reply related [flat|nested] 10+ messages in thread
end of thread, other threads:[~2010-01-07 17:26 UTC | newest] Thread overview: 10+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2009-12-11 1:34 [PATCH V2 6/8] lzma: Make lzma available to non initramfs/initrd code Phillip Lougher 2010-01-06 22:04 ` Andrew Morton 2010-01-06 22:45 ` Albin Tonnerre 2010-01-07 0:04 ` Stephen Rothwell 2010-01-07 0:20 ` Phillip Lougher 2010-01-07 0:31 ` Andrew Morton 2010-01-07 0:37 ` Phillip Lougher 2010-01-07 7:43 ` [PATCH V2 6/8] lzma: Make lzma ... thunderbird ok Hein_Tibosch 2010-01-07 17:26 ` Marco Stornelli -- strict thread matches above, loose matches on Subject: below -- 2010-01-07 0:49 [PATCH V2 6/8] lzma: Make lzma available to non initramfs/initrd code Phillip Lougher
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).