memblock: remove _virt from APIs returning virtual address

[linux-2.6-block.git] / arch / arm / kernel / setup.c

diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c
index 4c249cb261f3913112792cd6cad0a7e2df17ff4f..39e6090d23acc4f1fba831b41096b5ac11b842de 100644 (file)
--- a/arch/arm/kernel/setup.c
+++ b/arch/arm/kernel/setup.c
@@ -857,7 +857,7 @@ static void __init request_standard_resources(const struct machine_desc *mdesc)
                 */
                boot_alias_start = phys_to_idmap(start);
                if (arm_has_idmap_alias() && boot_alias_start != IDMAP_INVALID_ADDR) {
-                       res = memblock_virt_alloc(sizeof(*res), 0);
+                       res = memblock_alloc(sizeof(*res), 0);
                        res->name = "System RAM (boot alias)";
                        res->start = boot_alias_start;
                        res->end = phys_to_idmap(end);
@@ -865,7 +865,7 @@ static void __init request_standard_resources(const struct machine_desc *mdesc)
                        request_resource(&iomem_resource, res);
                }
 
-               res = memblock_virt_alloc(sizeof(*res), 0);
+               res = memblock_alloc(sizeof(*res), 0);
                res->name  = "System RAM";
                res->start = start;
                res->end = end;