summaryrefslogtreecommitdiffstats
path: root/arch/arm/mm
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2012-01-19 15:35:19 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2012-01-19 18:26:29 +0100
commitbc2827d08cb31de5ab3a467a3e1572d8437340e6 (patch)
treef75be9f88248090ef21b01c63f43d250b677f4c9 /arch/arm/mm
parentARM: sa11x0: fix section mismatch in cpu-sa1100.c (diff)
downloadlinux-bc2827d08cb31de5ab3a467a3e1572d8437340e6.tar.xz
linux-bc2827d08cb31de5ab3a467a3e1572d8437340e6.zip
ARM: fix a section mismatch warning with our use of memblock
Commit 716a3dc2008 (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 <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mm')
-rw-r--r--arch/arm/mm/init.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c
index 6ec1226fc62d..5dc7d127a40f 100644
--- a/arch/arm/mm/init.c
+++ b/arch/arm/mm/init.c
@@ -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;