lib/decompress.c adding __init to decompress_method and data

PATCH New Hein Tibosch 1 participant 1 message Aug 31, 2012 Library code

lore

Share & tools

lore

Hein Tibosch

author

2012-08-31 06:24 UTC #0 lore raw

PATCH 1/1 lib/decompress.c adding __init to decompress_method and data

Every time when compiling a new Linux kernel, I'm surprised that this warning still occurs:

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..

This patch should solve it:

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, it's user decompress_method() will get the __init prefix.

Signed-off-by Hein Tibosch <[email protected]>

---
 lib/decompress.c |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

lib/decompress.c +6 -3

index 3d766b7..31a8042 100644
@@ -14,6 +14,7 @@
 
 #include <linux/types.h>
 #include <linux/string.h>
+#include <linux/init.h>
 
 #ifndef CONFIG_DECOMPRESS_GZIP
 # define gunzip NULL

@@ -31,11 +32,13 @@
 # define unlzo NULL
 #endif
 
-static const struct compress_format {
+struct compress_format {
 	unsigned char magic[2];
 	const char *name;
 	decompress_fn decompressor;
-} compressed_formats[] = {
+};
+
+static const struct compress_format compressed_formats[] __initdata = {
 	{ {037, 0213}, "gzip", gunzip },
 	{ {037, 0236}, "gzip", gunzip },
 	{ {0x42, 0x5a}, "bzip2", bunzip2 },

@@ -45,7 +48,7 @@ static const struct compress_format {
 	{ {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 struct compress_format *cf;

Signature · 1 line

1.7.8.0