On Wed, 05 Aug 2009 01:47:57 +0100 Phillip Lougher <phillip@xxxxxxxxxxxxxxxxxxx> wrote: > Andrew Morton wrote: > > On Mon, 3 Aug 2009 16:58:16 +0200 > > Albin Tonnerre <albin.tonnerre@xxxxxxxxxxxxxxxxxx> wrote: > > > >> These includes were added by 079effb6933f34b9b1b67b08bd4fd7fb672d16ef to > >> fix the build when using kmemtrace. However this is not necessary when > >> used to create a compressed kernel, and actually creates issues (brings > >> a lot of things unavailable in the decompression environment), so don't > >> include it if STATIC is defined. > >> > > > > The description "actually creates issues (brings a lot of things > > unavailable in the decompression environment)" is inadequate. Please > > describe te problem this patch fixes more completely so that others > > (ie: me) can decide whether this patch is needed in 2.6.32, 2.6.31. > > 2.6.30, ... > > > > > > This patch conflicts heavily with > > > > http://userweb.kernel.org/~akpm/mmotm/broken-out/bzip2-lzma-remove-nasty-uncompressed-size-hack-in-pre-boot-environment.patch > > > > > > What should we do about that? > > > What do you normally do in this situation? I normally fix the rejects ;) But I'd like to confirm that the two patches don't fix the same thing via different means. Lacking a full description of Albin's "issues", that's hard to determine. They do appear to be unrelated. > I'm happy to send a revised > bzip2-lzma-remove-nasty-uncompressed-size-hack-in-pre-boot-environment.patch > that would apply cleanly on-top of Alvin's patch, but, this will obviously > create dependencies on his patch being applied. Reworked lib-decompress_-only-include-linux-slabh-if-static-is-not-defined.patch: lib/decompress_bunzip2.c | 2 +- lib/decompress_inflate.c | 2 +- lib/decompress_unlzma.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff -puN lib/decompress_bunzip2.c~lib-decompress_-only-include-linux-slabh-if-static-is-not-defined lib/decompress_bunzip2.c --- a/lib/decompress_bunzip2.c~lib-decompress_-only-include-linux-slabh-if-static-is-not-defined +++ a/lib/decompress_bunzip2.c @@ -49,10 +49,10 @@ #define PREBOOT #else #include <linux/decompress/bunzip2.h> +#include <linux/slab.h> #endif /* STATIC */ #include <linux/decompress/mm.h> -#include <linux/slab.h> #ifndef INT_MAX #define INT_MAX 0x7fffffff diff -puN lib/decompress_inflate.c~lib-decompress_-only-include-linux-slabh-if-static-is-not-defined lib/decompress_inflate.c --- a/lib/decompress_inflate.c~lib-decompress_-only-include-linux-slabh-if-static-is-not-defined +++ a/lib/decompress_inflate.c @@ -19,11 +19,11 @@ #include "zlib_inflate/inflate.h" #include "zlib_inflate/infutil.h" +#include <linux/slab.h> #endif /* STATIC */ #include <linux/decompress/mm.h> -#include <linux/slab.h> #define GZIP_IOBUF_SIZE (16*1024) diff -puN lib/decompress_unlzma.c~lib-decompress_-only-include-linux-slabh-if-static-is-not-defined lib/decompress_unlzma.c --- a/lib/decompress_unlzma.c~lib-decompress_-only-include-linux-slabh-if-static-is-not-defined +++ a/lib/decompress_unlzma.c @@ -33,10 +33,10 @@ #define PREBOOT #else #include <linux/decompress/unlzma.h> +#include <linux/slab.h> #endif /* STATIC */ #include <linux/decompress/mm.h> -#include <linux/slab.h> #define MIN(a, b) (((a) < (b)) ? (a) : (b)) _ -- To unsubscribe from this list: send the line "unsubscribe linux-embedded" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
