|
@@ -2791,9 +2791,7 @@ static int __init _alloc_links(struct omap_hwmod_link **ml,
|
|
sz = sizeof(struct omap_hwmod_link) * LINKS_PER_OCP_IF;
|
|
sz = sizeof(struct omap_hwmod_link) * LINKS_PER_OCP_IF;
|
|
|
|
|
|
*sl = NULL;
|
|
*sl = NULL;
|
|
- *ml = alloc_bootmem(sz);
|
|
|
|
-
|
|
|
|
- memset(*ml, 0, sz);
|
|
|
|
|
|
+ *ml = memblock_virt_alloc(sz, 0);
|
|
|
|
|
|
*sl = (void *)(*ml) + sizeof(struct omap_hwmod_link);
|
|
*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",
|
|
pr_debug("omap_hwmod: %s: allocating %d byte linkspace (%d links)\n",
|
|
__func__, sz, max_ls);
|
|
__func__, sz, max_ls);
|
|
|
|
|
|
- linkspace = alloc_bootmem(sz);
|
|
|
|
-
|
|
|
|
- memset(linkspace, 0, sz);
|
|
|
|
|
|
+ linkspace = memblock_virt_alloc(sz, 0);
|
|
|
|
|
|
return 0;
|
|
return 0;
|
|
}
|
|
}
|