Commit 33e2a422 authored Oct 04, 2012 by Hein Tibosch Committed by Linus Torvalds Oct 06, 2012

lib/decompress.c add __init to decompress_method and data



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>

parent 4965f566

lib/decompress.c

+6 −3

Original line number	Diff line number	Diff line
		@@ -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;

Admin message