The patch titled
Decompressors: include <linux/slab.h> in <linux/decompress/mm.h>
has been added to the -mm tree. Its filename is
decompressors-include-linux-slabh-in-linux-decompress-mmh.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find
out what to do about this
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: Decompressors: include <linux/slab.h> in <linux/decompress/mm.h>
From: Lasse Collin <lasse.collin@xxxxxxxxxxx>
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@xxxxxxxxxxx>
Cc: "H. Peter Anvin" <hpa@xxxxxxxxx>
Cc: Alain Knaff <alain@xxxxxxxx>
Cc: Albin Tonnerre <albin.tonnerre@xxxxxxxxxxxxxxxxxx>
Cc: Phillip Lougher <phillip@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
include/linux/decompress/mm.h | 1 +
lib/decompress_bunzip2.c | 1 -
lib/decompress_inflate.c | 1 -
lib/decompress_unlzma.c | 1 -
lib/decompress_unlzo.c | 1 -
5 files changed, 1 insertion(+), 4 deletions(-)
diff -puN include/linux/decompress/mm.h~decompressors-include-linux-slabh-in-linux-decompress-mmh include/linux/decompress/mm.h
--- a/include/linux/decompress/mm.h~decompressors-include-linux-slabh-in-linux-decompress-mmh
+++ a/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 -puN lib/decompress_bunzip2.c~decompressors-include-linux-slabh-in-linux-decompress-mmh lib/decompress_bunzip2.c
--- a/lib/decompress_bunzip2.c~decompressors-include-linux-slabh-in-linux-decompress-mmh
+++ a/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 -puN lib/decompress_inflate.c~decompressors-include-linux-slabh-in-linux-decompress-mmh lib/decompress_inflate.c
--- a/lib/decompress_inflate.c~decompressors-include-linux-slabh-in-linux-decompress-mmh
+++ a/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 -puN lib/decompress_unlzma.c~decompressors-include-linux-slabh-in-linux-decompress-mmh lib/decompress_unlzma.c
--- a/lib/decompress_unlzma.c~decompressors-include-linux-slabh-in-linux-decompress-mmh
+++ a/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 -puN lib/decompress_unlzo.c~decompressors-include-linux-slabh-in-linux-decompress-mmh lib/decompress_unlzo.c
--- a/lib/decompress_unlzo.c~decompressors-include-linux-slabh-in-linux-decompress-mmh
+++ a/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
_
Patches currently in -mm which might be from lasse.collin@xxxxxxxxxxx are
decompressors-add-missing-init-ie-__init.patch
decompressors-get-rid-of-set_error_fn-macro.patch
decompressors-include-linux-slabh-in-linux-decompress-mmh.patch
decompressors-remove-unused-function-from-lib-decompress_unlzmac.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
