diff options
author | Alex Shi <alex.shi@linaro.org> | 2015-04-23 14:55:22 +0800 |
---|---|---|
committer | Alex Shi <alex.shi@linaro.org> | 2015-04-23 14:55:22 +0800 |
commit | 14cdcbf57afac55489130a55ea0e8a59481531d8 (patch) | |
tree | c40cb75901875f0510e5f3a7b69052ac888a7fcc | |
parent | d78c0d2e460efcd924f9a219d3ffc072624e1a68 (diff) | |
parent | e13c574895626b6e8bd53f340dbd47f67871b26b (diff) |
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-androidlsk-v3.10-15.04-android
-rw-r--r-- | arch/arm64/kernel/setup.c | 19 | ||||
-rw-r--r-- | arch/arm64/mm/init.c | 19 |
2 files changed, 19 insertions, 19 deletions
diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c index fedd56b36cf0..3d0b5a285061 100644 --- a/arch/arm64/kernel/setup.c +++ b/arch/arm64/kernel/setup.c @@ -369,25 +369,6 @@ void * __init early_init_dt_alloc_memory_arch(u64 size, u64 align) return __va(memblock_alloc(size, align)); } -/* - * Limit the memory size that was specified via FDT. - */ -static int __init early_mem(char *p) -{ - phys_addr_t limit; - - if (!p) - return 1; - - limit = memparse(p, &p) & PAGE_MASK; - pr_notice("Memory limited to %lldMB\n", limit >> 20); - - memblock_enforce_memory_limit(limit); - - return 0; -} -early_param("mem", early_mem); - static void __init request_standard_resources(void) { struct memblock_region *region; diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c index 109a0442b6a1..9a9eaadb8634 100644 --- a/arch/arm64/mm/init.c +++ b/arch/arm64/mm/init.c @@ -143,11 +143,30 @@ static void arm64_memory_present(void) } #endif +static phys_addr_t memory_limit = (phys_addr_t)ULLONG_MAX; + +/* + * Limit the memory size that was specified via FDT. + */ +static int __init early_mem(char *p) +{ + if (!p) + return 1; + + memory_limit = memparse(p, &p) & PAGE_MASK; + pr_notice("Memory limited to %lldMB\n", memory_limit >> 20); + + return 0; +} +early_param("mem", early_mem); + void __init arm64_memblock_init(void) { u64 *reserve_map, base, size; phys_addr_t dma_phys_limit = 0; + memblock_enforce_memory_limit(memory_limit); + /* * Register the kernel text, kernel data, initrd, and initial * pagetables with memblock. |