]> git.baikalelectronics.ru Git - kernel.git/commit
lib/decompress_*: only include <linux/slab.h> if STATIC is not defined
authorAlbin Tonnerre <albin.tonnerre@free-electrons.com>
Thu, 6 Aug 2009 22:09:32 +0000 (15:09 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 7 Aug 2009 17:39:56 +0000 (10:39 -0700)
commit31cf4c24dc9ef511f8ecad225379b0e6ff92c9ed
treebcbe47f04c7dab0821a8053517e864c1802039ad
parent4b3a2da8021d3c970e3b13863dc62c66004881d2
lib/decompress_*: only include <linux/slab.h> if STATIC is not defined

These includes were added by c35e9936aadc204c941dc1987546579cb803a4ec
("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>
lib/decompress_bunzip2.c
lib/decompress_inflate.c
lib/decompress_unlzma.c