Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 036fbb21 authored by Kirill A. Shutemov's avatar Kirill A. Shutemov Committed by Linus Torvalds
Browse files

memblock: fix section mismatch 



allmodconfig produces following warning for me:

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

Let's mark the function with __meminit.  It fixes the warning.

Signed-off-by: default avatarKirill A. Shutemov <kirill.shutemov@linux.intel.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent fef8953a

include/linux/memblock.h

+9 −9
Original line number Diff line number Diff line
@@ -61,6 +61,14 @@ extern int memblock_debug; 
extern bool movable_node_enabled;

#endif /* CONFIG_MOVABLE_NODE */



#ifdef CONFIG_ARCH_DISCARD_MEMBLOCK

#define __init_memblock __meminit

#define __initdata_memblock __meminitdata

#else

#define __init_memblock

#define __initdata_memblock

#endif



#define memblock_dbg(fmt, ...) \

	if (memblock_debug) printk(KERN_INFO pr_fmt(fmt), ##__VA_ARGS__)
@@ -166,7 +174,7 @@ static inline bool memblock_is_hotpluggable(struct memblock_region *m) 
	return m->flags & MEMBLOCK_HOTPLUG;

}



static inline bool movable_node_is_enabled(void)

static inline bool __init_memblock movable_node_is_enabled(void)

{

	return movable_node_enabled;

}
@@ -405,14 +413,6 @@ static inline unsigned long memblock_region_reserved_end_pfn(const struct memblo 
	for (idx = 0; idx < memblock_type->cnt;				\

	     idx++,rgn = &memblock_type->regions[idx])



#ifdef CONFIG_ARCH_DISCARD_MEMBLOCK

#define __init_memblock __meminit

#define __initdata_memblock __meminitdata

#else

#define __init_memblock

#define __initdata_memblock

#endif



#ifdef CONFIG_MEMTEST

extern void early_memtest(phys_addr_t start, phys_addr_t end);

#else