diff options
author | Lasse Collin <lasse.collin@tukaani.org> | 2011-01-12 20:01:15 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-13 11:03:23 -0500 |
commit | 2b6b5caa6d05579bd1501006e34feec1b2aef8c4 (patch) | |
tree | 9345fc087fab818c36bf348a563ba1f83c350bda | |
parent | 93685ad247ef65b7d6f90ffe97b44f5cfeaf40d3 (diff) |
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.h | 1 | ||||
-rw-r--r-- | lib/decompress_bunzip2.c | 1 | ||||
-rw-r--r-- | lib/decompress_inflate.c | 1 | ||||
-rw-r--r-- | lib/decompress_unlzma.c | 1 | ||||
-rw-r--r-- | lib/decompress_unlzo.c | 1 |
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) | |||
70 | #include <linux/kernel.h> | 70 | #include <linux/kernel.h> |
71 | #include <linux/fs.h> | 71 | #include <linux/fs.h> |
72 | #include <linux/string.h> | 72 | #include <linux/string.h> |
73 | #include <linux/slab.h> | ||
73 | #include <linux/vmalloc.h> | 74 | #include <linux/vmalloc.h> |
74 | 75 | ||
75 | /* Use defines rather than static inline in order to avoid spurious | 76 | /* 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 @@ | |||
49 | #define PREBOOT | 49 | #define PREBOOT |
50 | #else | 50 | #else |
51 | #include <linux/decompress/bunzip2.h> | 51 | #include <linux/decompress/bunzip2.h> |
52 | #include <linux/slab.h> | ||
53 | #endif /* STATIC */ | 52 | #endif /* STATIC */ |
54 | 53 | ||
55 | #include <linux/decompress/mm.h> | 54 | #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 @@ | |||
19 | #include "zlib_inflate/inflate.h" | 19 | #include "zlib_inflate/inflate.h" |
20 | 20 | ||
21 | #include "zlib_inflate/infutil.h" | 21 | #include "zlib_inflate/infutil.h" |
22 | #include <linux/slab.h> | ||
23 | 22 | ||
24 | #endif /* STATIC */ | 23 | #endif /* STATIC */ |
25 | 24 | ||
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 @@ | |||
33 | #define PREBOOT | 33 | #define PREBOOT |
34 | #else | 34 | #else |
35 | #include <linux/decompress/unlzma.h> | 35 | #include <linux/decompress/unlzma.h> |
36 | #include <linux/slab.h> | ||
37 | #endif /* STATIC */ | 36 | #endif /* STATIC */ |
38 | 37 | ||
39 | #include <linux/decompress/mm.h> | 38 | #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 @@ | |||
33 | #ifdef STATIC | 33 | #ifdef STATIC |
34 | #include "lzo/lzo1x_decompress.c" | 34 | #include "lzo/lzo1x_decompress.c" |
35 | #else | 35 | #else |
36 | #include <linux/slab.h> | ||
37 | #include <linux/decompress/unlzo.h> | 36 | #include <linux/decompress/unlzo.h> |
38 | #endif | 37 | #endif |
39 | 38 | ||