diff options
| author | Ingo Molnar <mingo@elte.hu> | 2012-02-07 08:59:29 (GMT) |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2012-02-07 08:59:29 (GMT) |
| commit | 290436c9c61ac983b1bd425da67242a4357c7701 (patch) | |
| tree | 35e1f189b62eb50515600ad607d7fb57fc547870 /arch/arm/mm/init.c | |
| parent | 623ec991ce0e8cd5791bad656c162fa837635907 (diff) | |
| parent | 62aa2b537c6f5957afd98e29f96897419ed5ebab (diff) | |
| download | linux-fsl-qoriq-290436c9c61ac983b1bd425da67242a4357c7701.tar.xz | |
Merge tag 'v3.3-rc2' into perf/core
Linux 3.3-rc2
Pick up the latest fixes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/arm/mm/init.c')
| -rw-r--r-- | arch/arm/mm/init.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c index 6ec1226..5dc7d12 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; |