OpenSDV
/
original_kernel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

decompressor: provide missing prototypes 

The entry points for the decompressor don't always have a prototype
included in the .c file:

lib/decompress_inflate.c:42:17: error: no previous prototype for '__gunzip' [-Werror=missing-prototypes]
lib/decompress_unxz.c:251:17: error: no previous prototype for 'unxz' [-Werror=missing-prototypes]
lib/decompress_unzstd.c:331:17: error: no previous prototype for 'unzstd' [-Werror=missing-prototypes]

Include the correct headers for unxz and unzstd, and mark the inflate
function above as unconditionally 'static' to avoid these warnings.

Link: https://lkml.kernel.org/r/20230517131936.936840-1-arnd@kernel.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Nick Terrell <terrelln@fb.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
This commit is contained in:
Arnd Bergmann 2023-05-17 15:19:31 +02:00 committed by Andrew Morton
parent 6aee6723f1
commit 0044444861
3 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/decompress_inflate.c
View File

@ -39,7 +39,7 @@ static long INIT nofill(void *buffer, unsigned long len)
} }
/* Included from initramfs et al code */ /* Included from initramfs et al code */
STATIC int INIT __gunzip(unsigned char *buf, long len, static int INIT __gunzip(unsigned char *buf, long len,
long (*fill)(void*, unsigned long), long (*fill)(void*, unsigned long),
long (*flush)(void*, unsigned long), long (*flush)(void*, unsigned long),
unsigned char *out_buf, long out_len, unsigned char *out_buf, long out_len,

2
lib/decompress_unxz.c
View File

@ -102,6 +102,8 @@
*/ */
#ifdef STATIC #ifdef STATIC
# define XZ_PREBOOT # define XZ_PREBOOT
#else
#include <linux/decompress/unxz.h>
#endif #endif
#ifdef __KERNEL__ #ifdef __KERNEL__
# include <linux/decompress/mm.h> # include <linux/decompress/mm.h>

2
lib/decompress_unzstd.c
View File

@ -69,6 +69,8 @@
# define UNZSTD_PREBOOT # define UNZSTD_PREBOOT
# include "xxhash.c" # include "xxhash.c"
# include "zstd/decompress_sources.h" # include "zstd/decompress_sources.h"
#else
#include <linux/decompress/unzstd.h>
#endif #endif
#include <linux/decompress/mm.h> #include <linux/decompress/mm.h>