Subject: [merged] lib-decompress_inflatec-include-appropriate-header-file.patch removed from -mm tree To: rashika.kheria@xxxxxxxxx,josh@xxxxxxxxxxxxxxxx,mm-commits@xxxxxxxxxxxxxxx From: akpm@xxxxxxxxxxxxxxxxxxxx Date: Fri, 04 Apr 2014 12:33:48 -0700 The patch titled Subject: lib/decompress_inflate.c: include appropriate header file has been removed from the -mm tree. Its filename was lib-decompress_inflatec-include-appropriate-header-file.patch This patch was dropped because it was merged into mainline or a subsystem tree ------------------------------------------------------ From: Rashika Kheria <rashika.kheria@xxxxxxxxx> Subject: lib/decompress_inflate.c: include appropriate header file Include appropriate header file include/linux/decompress/inflate.h in lib/decompress_inflate.c because it has prototype declaration of function defined in lib/decompress_inflate.c. Also, fix the guard around the header file include/linux/decompress/inflate.h to use a more unique guard symbol. This avoids conflict with the INFLATE_H defined by zlib_inflate/inflate.h. This eliminates the following warning in lib/decompress_inflate.c: lib/decompress_inflate.c:35:17: warning: no previous prototype for `gunzip' [-Wmissing-prototypes] Signed-off-by: Rashika Kheria <rashika.kheria@xxxxxxxxx> Reviewed-by: Josh Triplett <josh@xxxxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- include/linux/decompress/inflate.h | 4 ++-- lib/decompress_inflate.c | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff -puN include/linux/decompress/inflate.h~lib-decompress_inflatec-include-appropriate-header-file include/linux/decompress/inflate.h --- a/include/linux/decompress/inflate.h~lib-decompress_inflatec-include-appropriate-header-file +++ a/include/linux/decompress/inflate.h @@ -1,5 +1,5 @@ -#ifndef INFLATE_H -#define INFLATE_H +#ifndef LINUX_DECOMPRESS_INFLATE_H +#define LINUX_DECOMPRESS_INFLATE_H int gunzip(unsigned char *inbuf, int len, int(*fill)(void*, unsigned int), diff -puN lib/decompress_inflate.c~lib-decompress_inflatec-include-appropriate-header-file lib/decompress_inflate.c --- a/lib/decompress_inflate.c~lib-decompress_inflatec-include-appropriate-header-file +++ a/lib/decompress_inflate.c @@ -19,6 +19,7 @@ #include "zlib_inflate/inflate.h" #include "zlib_inflate/infutil.h" +#include <linux/decompress/inflate.h> #endif /* STATIC */ _ Patches currently in -mm which might be from rashika.kheria@xxxxxxxxx are origin.patch include-linux-crash_dumph-add-vmcore_cleanup-prototype.patch include-linux-crash_dumph-add-vmcore_cleanup-prototype-fix.patch linux-next.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