Commit c2233116 authored Oct 08, 2012 by Raghavendra D Prabhu Committed by Linus Torvalds Oct 09, 2012

mm: avoid section mismatch warning for memblock_type_name



Following section mismatch warning is thrown during build;

    WARNING: vmlinux.o(.text+0x32408f): Section mismatch in reference from the function memblock_type_name() to the variable .meminit.data:memblock
    The function memblock_type_name() references
    the variable __meminitdata memblock.
    This is often because memblock_type_name lacks a __meminitdata
    annotation or the annotation of memblock is wrong.

This is because memblock_type_name makes reference to memblock variable
with attribute __meminitdata.  Hence, the warning (even if the function is
inline).

[akpm@linux-foundation.org: remove inline]
Signed-off-by: Raghavendra D Prabhu <rprabhu@wnohang.net>
Cc: Tejun Heo <tj@kernel.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 3e648ebe

mm/memblock.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -41,7 +41,8 @@ static int memblock_memory_in_slab __initdata_memblock = 0;
		static int memblock_reserved_in_slab __initdata_memblock = 0;

		/* inline so we don't get a warning when pr_debug is compiled out */
		static inline const char memblock_type_name(struct memblock_type type)
		static __init_memblock const char *
		memblock_type_name(struct memblock_type *type)
		{
		if (type == &memblock.memory)
		return "memory";

Admin message