Switch to memblock interfaces for early memory allocator

Cc: Yinghai Lu <[email protected]>
Cc: Tejun Heo <[email protected]>
Cc: Andrew Morton <[email protected]>

Signed-off-by: Santosh Shilimkar <[email protected]>
---
 arch/arm/mach-omap2/omap_hwmod.c |    8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c
index d9ee0ff..adfd6a2 100644
--- a/arch/arm/mach-omap2/omap_hwmod.c
+++ b/arch/arm/mach-omap2/omap_hwmod.c
@@ -2676,9 +2676,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_early_alloc(sz);
 
        *sl = (void *)(*ml) + sizeof(struct omap_hwmod_link);
 
@@ -2797,9 +2795,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_early_alloc(sz);
 
        return 0;
 }
-- 
1.7.9.5

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to