diff options
Diffstat (limited to 'arch/arm/plat-omap/devices.c')
-rw-r--r-- | arch/arm/plat-omap/devices.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/plat-omap/devices.c b/arch/arm/plat-omap/devices.c index 19719329a47b..60278f47c0bd 100644 --- a/arch/arm/plat-omap/devices.c +++ b/arch/arm/plat-omap/devices.c | |||
@@ -20,6 +20,7 @@ | |||
20 | #include <mach/hardware.h> | 20 | #include <mach/hardware.h> |
21 | #include <asm/mach-types.h> | 21 | #include <asm/mach-types.h> |
22 | #include <asm/mach/map.h> | 22 | #include <asm/mach/map.h> |
23 | #include <asm/memblock.h> | ||
23 | 24 | ||
24 | #include <plat/tc.h> | 25 | #include <plat/tc.h> |
25 | #include <plat/board.h> | 26 | #include <plat/board.h> |
@@ -164,14 +165,12 @@ void __init omap_dsp_reserve_sdram_memblock(void) | |||
164 | if (!size) | 165 | if (!size) |
165 | return; | 166 | return; |
166 | 167 | ||
167 | paddr = memblock_alloc(size, SZ_1M); | 168 | paddr = arm_memblock_steal(size, SZ_1M); |
168 | if (!paddr) { | 169 | if (!paddr) { |
169 | pr_err("%s: failed to reserve %x bytes\n", | 170 | pr_err("%s: failed to reserve %x bytes\n", |
170 | __func__, size); | 171 | __func__, size); |
171 | return; | 172 | return; |
172 | } | 173 | } |
173 | memblock_free(paddr, size); | ||
174 | memblock_remove(paddr, size); | ||
175 | 174 | ||
176 | omap_dsp_phys_mempool_base = paddr; | 175 | omap_dsp_phys_mempool_base = paddr; |
177 | } | 176 | } |