diff options
| author |   Mike Turquette <mturquette@linaro.org> | 2014-02-24 22:21:29 -0800 |
|---|---|---|
| committer | Mike Turquette <mturquette@linaro.org> | 2014-02-24 22:21:29 -0800 |
| commit | 10b7cdc0084c27a312e59e80420c6aac70c64753 (patch) | |
| tree | ee891d6236bcd8dc988624839760aaa1846cf906 /arch/arm/kernel/setup.c | |
| parent | clk: Correct handling of NULL clk in __clk_{get, put} (diff) | |
| parent | clk: shmobile: Fix typo in MSTP clock DT bindings (diff) | |
| download | linux-dev-10b7cdc0084c27a312e59e80420c6aac70c64753.tar.xz linux-dev-10b7cdc0084c27a312e59e80420c6aac70c64753.zip | |
Merge branch 'clocks/fixes/drivers' of git://linuxtv.org/pinchartl/fbdev into clk-fixes
Diffstat (limited to 'arch/arm/kernel/setup.c')
| -rw-r--r-- | arch/arm/kernel/setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c index b0df9761de6d..1e8b030dbefd 100644 --- a/arch/arm/kernel/setup.c +++ b/arch/arm/kernel/setup.c @@ -731,7 +731,7 @@ static void __init request_standard_resources(const struct machine_desc *mdesc) kernel_data.end = virt_to_phys(_end - 1); for_each_memblock(memory, region) { - res = memblock_virt_alloc_low(sizeof(*res), 0); + res = memblock_virt_alloc(sizeof(*res), 0); res->name = "System RAM"; res->start = __pfn_to_phys(memblock_region_memory_base_pfn(region)); res->end = __pfn_to_phys(memblock_region_memory_end_pfn(region)) - 1; |