summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLasse Collin <lasse.collin@tukaani.org>2011-01-12 17:01:15 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2011-01-13 08:03:23 -0800
commit2b6b5caa6d05579bd1501006e34feec1b2aef8c4 (patch)
tree9345fc087fab818c36bf348a563ba1f83c350bda
parent93685ad247ef65b7d6f90ffe97b44f5cfeaf40d3 (diff)
downloadlinux-2b6b5caa6d05579bd1501006e34feec1b2aef8c4.tar.gz
linux-2b6b5caa6d05579bd1501006e34feec1b2aef8c4.tar.bz2
linux-2b6b5caa6d05579bd1501006e34feec1b2aef8c4.zip
Decompressors: include <linux/slab.h> in <linux/decompress/mm.h>
Currently users of mm.h need to include <linux/slab.h> to use the macros malloc() and free() provided by mm.h. This fixes it. Signed-off-by: Lasse Collin <lasse.collin@tukaani.org> Cc: "H. Peter Anvin" <hpa@zytor.com> Cc: Alain Knaff <alain@knaff.lu> Cc: Albin Tonnerre <albin.tonnerre@free-electrons.com> 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>
-rw-r--r--include/linux/decompress/mm.h1
-rw-r--r--lib/decompress_bunzip2.c1
-rw-r--r--lib/decompress_inflate.c1
-rw-r--r--lib/decompress_unlzma.c1
-rw-r--r--lib/decompress_unlzo.c1
5 files changed, 1 insertions, 4 deletions
diff --git a/include/linux/decompress/mm.h b/include/linux/decompress/mm.h
index a31e9820710a..4cb72b920c74 100644
--- a/include/linux/decompress/mm.h
+++ b/include/linux/decompress/mm.h
@@ -70,6 +70,7 @@ static void free(void *where)
#include <linux/kernel.h>
#include <linux/fs.h>
#include <linux/string.h>
+#include <linux/slab.h>
#include <linux/vmalloc.h>
/* Use defines rather than static inline in order to avoid spurious
diff --git a/lib/decompress_bunzip2.c b/lib/decompress_bunzip2.c
index e805087f5561..a7b80c1d6a0d 100644
--- a/lib/decompress_bunzip2.c
+++ b/lib/decompress_bunzip2.c
@@ -49,7 +49,6 @@
#define PREBOOT
#else
#include <linux/decompress/bunzip2.h>
-#include <linux/slab.h>
#endif /* STATIC */
#include <linux/decompress/mm.h>
diff --git a/lib/decompress_inflate.c b/lib/decompress_inflate.c
index 9a7f5dfc0ed7..b5fe1d1d5f05 100644
--- a/lib/decompress_inflate.c
+++ b/lib/decompress_inflate.c
@@ -19,7 +19,6 @@
#include "zlib_inflate/inflate.h"
#include "zlib_inflate/infutil.h"
-#include <linux/slab.h>
#endif /* STATIC */
diff --git a/lib/decompress_unlzma.c b/lib/decompress_unlzma.c
index 2787dc560e4b..946b83be3bcc 100644
--- a/lib/decompress_unlzma.c
+++ b/lib/decompress_unlzma.c
@@ -33,7 +33,6 @@
#define PREBOOT
#else
#include <linux/decompress/unlzma.h>
-#include <linux/slab.h>
#endif /* STATIC */
#include <linux/decompress/mm.h>
diff --git a/lib/decompress_unlzo.c b/lib/decompress_unlzo.c
index df3e98f945a6..6e56d547ba32 100644
--- a/lib/decompress_unlzo.c
+++ b/lib/decompress_unlzo.c
@@ -33,7 +33,6 @@
#ifdef STATIC
#include "lzo/lzo1x_decompress.c"
#else
-#include <linux/slab.h>
#include <linux/decompress/unlzo.h>
#endif