Merge tag 'clk-for-linus-3.14-part2' of git://git.linaro.org/people/mike.turquette...

[linux-2.6-block.git] / arch / arm / mach-omap2 / omap_hwmod.c

diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c
index 433fe2f9278c824132644ce4f573512e3e1c7a9e..42d81885c700c498babd2dd2e5d322e3af2c3f19 100644 (file)
--- a/arch/arm/mach-omap2/omap_hwmod.c
+++ b/arch/arm/mach-omap2/omap_hwmod.c
@@ -2793,9 +2793,7 @@ static int __init _alloc_links(struct omap_hwmod_link **ml,
        sz = sizeof(struct omap_hwmod_link) * LINKS_PER_OCP_IF;
 
        *sl = NULL;
-       *ml = alloc_bootmem(sz);
-
-       memset(*ml, 0, sz);
+       *ml = memblock_virt_alloc(sz, 0);
 
        *sl = (void *)(*ml) + sizeof(struct omap_hwmod_link);
 
@@ -2914,9 +2912,7 @@ static int __init _alloc_linkspace(struct omap_hwmod_ocp_if **ois)
        pr_debug("omap_hwmod: %s: allocating %d byte linkspace (%d links)\n",
                 __func__, sz, max_ls);
 
-       linkspace = alloc_bootmem(sz);
-
-       memset(linkspace, 0, sz);
+       linkspace = memblock_virt_alloc(sz, 0);
 
        return 0;
 }