adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-27 19:26:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
These includes were added by 079effb693
("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>
This commit is contained in:
Albin Tonnerre 2009-08-06 15:09:32 -07:00 committed by Linus Torvalds
parent b1af4315d8
commit 9e5cf0ca2e
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/decompress_bunzip2.c
View file

@ -49,10 +49,10 @@
#define PREBOOT #define PREBOOT
#else #else
#include <linux/decompress/bunzip2.h> #include <linux/decompress/bunzip2.h>
#include <linux/slab.h>
#endif /* STATIC */ #endif /* STATIC */
#include <linux/decompress/mm.h> #include <linux/decompress/mm.h>
#include <linux/slab.h>
#ifndef INT_MAX #ifndef INT_MAX
#define INT_MAX 0x7fffffff #define INT_MAX 0x7fffffff

2
lib/decompress_inflate.c
View file

@ -19,11 +19,11 @@
#include "zlib_inflate/inflate.h" #include "zlib_inflate/inflate.h"
#include "zlib_inflate/infutil.h" #include "zlib_inflate/infutil.h"
#include <linux/slab.h>
#endif /* STATIC */ #endif /* STATIC */
#include <linux/decompress/mm.h> #include <linux/decompress/mm.h>
#include <linux/slab.h>
#define GZIP_IOBUF_SIZE (16*1024) #define GZIP_IOBUF_SIZE (16*1024)

2
lib/decompress_unlzma.c
View file

@ -33,10 +33,10 @@
#define PREBOOT #define PREBOOT
#else #else
#include <linux/decompress/unlzma.h> #include <linux/decompress/unlzma.h>
#include <linux/slab.h>
#endif /* STATIC */ #endif /* STATIC */
#include <linux/decompress/mm.h> #include <linux/decompress/mm.h>
#include <linux/slab.h>
#define MIN(a, b) (((a) < (b)) ? (a) : (b)) #define MIN(a, b) (((a) < (b)) ? (a) : (b))