Commit 9e5cf0ca authored Aug 06, 2009 by Albin Tonnerre Committed by Linus Torvalds Aug 07, 2009

lib/decompress_*: only include <linux/slab.h> if STATIC is not defined



These includes were added by 079effb6
("kmemtrace, kbuild: fix slab.h dependency problem in
lib/decompress_inflate.c") 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.

Signed-off-by: Albin Tonnerre <albin.tonnerre@free-electrons.com>
Cc: Sam Ravnborg <sam@ravnborg.org>
Cc: Russell King <rmk@arm.linux.org.uk>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Pekka Enberg <penberg@cs.helsinki.fi>
Cc: Eduard - Gabriel Munteanu <eduard.munteanu@linux360.ro>
Cc: Phillip Lougher <phillip@lougher.demon.co.uk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent b1af4315

lib/decompress_bunzip2.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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

lib/decompress_inflate.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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)

lib/decompress_unlzma.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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))

Admin message