1 files changed, 2 insertions, 6 deletions

diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c
index 8a1b5e0bad40..f7a6fd35b1e4 100644
--- a/arch/arm/mach-omap2/omap_hwmod.c
+++ b/arch/arm/mach-omap2/omap_hwmod.c
@@ -2791,9 +2791,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);
 
@@ -2912,9 +2910,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;
 }