From c916fdb8e81ffd8cd90c6da85129f51de14f1e6f Mon Sep 17 00:00:00 2001 From: Russell King Date: Thu, 19 Jan 2012 14:35:19 +0000 Subject: [PATCH] --- yaml --- r: 286889 b: refs/heads/master c: bc2827d08cb31de5ab3a467a3e1572d8437340e6 h: refs/heads/master i: 286887: a58947a9f99929048a017a3b6163c7af599939bb v: v3 --- [refs] | 2 +- trunk/arch/arm/mm/init.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index ef62c6696dd1..45f891a9b953 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7a28b5a25f212b5f17cc0c973d1b8baa16069dd5 +refs/heads/master: bc2827d08cb31de5ab3a467a3e1572d8437340e6 diff --git a/trunk/arch/arm/mm/init.c b/trunk/arch/arm/mm/init.c index 6ec1226fc62d..5dc7d127a40f 100644 --- a/trunk/arch/arm/mm/init.c +++ b/trunk/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;