Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-26 04:42:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

lib/decompress.c add __init to decompress_method and data

Browse Source 
Fix the warning:

  WARNING: vmlinux.o(.text+0x14cfd8): Section mismatch in reference from the variable compressed_formats to the function .init.text:gunzip()
  The function compressed_formats() references
  the function __init gunzip().
  etc..

Within decompress.c, compressed_formats[] needs 'a __initdata annotation',
because some of it's data members refer to functions which will be
unloaded after init.

Consequently, its user decompress_method() will get the __init prefix.

Signed-off-by: Hein Tibosch <hein_tibosch@yahoo.es>
Cc: Albin Tonnerre <albin.tonnerre@free-electrons.com>
Cc: Phillip Lougher <phillip@lougher.demon.co.uk>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Hein Tibosch 2012-10-04 17:16:58 -07:00 committed by Linus Torvalds
parent 4965f5667f
commit 33e2a4227d
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/decompress.c
View File

@ -14,6 +14,7 @@
#include <linux/types.h> #include <linux/types.h>
#include <linux/string.h> #include <linux/string.h>
#include <linux/init.h>
#ifndef CONFIG_DECOMPRESS_GZIP #ifndef CONFIG_DECOMPRESS_GZIP
# define gunzip NULL # define gunzip NULL
@ -31,11 +32,13 @@
# define unlzo NULL # define unlzo NULL
#endif #endif
static const struct compress_format { struct compress_format {
unsigned char magic[2]; unsigned char magic[2];
const char *name; const char *name;
decompress_fn decompressor; decompress_fn decompressor;
} compressed_formats[] = { };
static const struct compress_format compressed_formats[] __initdata = {
{ {037, 0213}, "gzip", gunzip }, { {037, 0213}, "gzip", gunzip },
{ {037, 0236}, "gzip", gunzip }, { {037, 0236}, "gzip", gunzip },
{ {0x42, 0x5a}, "bzip2", bunzip2 }, { {0x42, 0x5a}, "bzip2", bunzip2 },
@ -45,7 +48,7 @@ static const struct compress_format {
{ {0, 0}, NULL, NULL } { {0, 0}, NULL, NULL }
}; };
decompress_fn decompress_method(const unsigned char *inbuf, int len, decompress_fn __init decompress_method(const unsigned char *inbuf, int len,
const char **name) const char **name)
{ {
const struct compress_format *cf; const struct compress_format *cf;