Skip to content

Commit

Permalink
ARM: fix a section mismatch warning with our use of memblock
Browse files Browse the repository at this point in the history
Commit 716a3dc (ARM: Add arm_memblock_steal() to allocate memory
away from the kernel) added a function which calls memblock_alloc().
This causes a section conflict:

WARNING: vmlinux.o(.text+0xc614): Section mismatch in reference from the function arm_memblock_steal() to the function .init.text:memblock_alloc()
The function arm_memblock_steal() references
the function __init memblock_alloc().

Signed-off-by: Russell King <[email protected]>
  • Loading branch information
Russell King committed Jan 19, 2012
1 parent 7a28b5a commit bc2827d
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion arch/arm/mm/init.c
Original file line number Diff line number Diff line change
Expand Up @@ -310,7 +310,7 @@ static void arm_memory_present(void)

static bool arm_memblock_steal_permitted = true;

phys_addr_t arm_memblock_steal(phys_addr_t size, phys_addr_t align)
phys_addr_t __init arm_memblock_steal(phys_addr_t size, phys_addr_t align)
{
phys_addr_t phys;

Expand Down

0 comments on commit bc2827d

Please sign in to comment.