diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-11-13 04:14:20 +0300 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-11-13 04:14:20 +0300 |
commit | 1c32ca9f63d2a103dd33eae72e5aff53a23fe650 (patch) | |
tree | 327640f35da4215ea67d03f08b798ef9d0e38ba5 /arch/arm | |
parent | 00dad7fa99701f5ca83b9f598d1c36c9523bbbf7 (diff) | |
parent | 94fb7c9c5d40edd538d7f2e048af5ab9ff55ef73 (diff) | |
download | linux-1c32ca9f63d2a103dd33eae72e5aff53a23fe650.tar.xz |
Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6
* 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: (38 commits)
Revert "staging: tidspbridge: replace iommu custom for opensource implementation"
Revert "staging: tidspbridge - move shared memory iommu maps to tiomap3430.c"
Revert "staging: tidspbridge - rename bridge_brd_mem_map/unmap to a proper name"
Revert "staging: tidspbridge - remove custom mmu code from tiomap3430.c"
Revert "staging: tidspbridge - fix mmufault support"
Revert "staging: tidspbridge - remove hw directory"
Revert "staging: tidspbridge - move all iommu related code to a new file"
Revert "staging: tidspbridge: remove dw_dmmu_base from cfg_hostres struct"
Revert "staging: tidspbridge - remove reserved memory clean up"
Revert "staging: tidspbridge - deprecate reserve/unreserve_memory funtions"
Revert "staging: tidspbridge - remove dmm custom module"
Revert "staging: tidspbridge - update Kconfig to select IOMMU module"
staging: tidspbridge: hardcode SCM macros while fix is upstreamed
Staging: keucr driver: fix uninitialized variable & proper memset length
omap: dsp: remove shm from normal memory
Staging: wlan-ng: Fix wrong #ifdef #endif sequence
Staging: Update parameters for cfg80211 key management operation
Staging: ath6kl: Fix pointer casts on 64-bit architectures
Staging: batman-adv: suppress false warning when changing the mac address
Staging: batman-adv: fix interface alternating and bonding reggression
...
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/plat-omap/devices.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/plat-omap/devices.c b/arch/arm/plat-omap/devices.c index 6f42a18b8aa4..fc819120978d 100644 --- a/arch/arm/plat-omap/devices.c +++ b/arch/arm/plat-omap/devices.c @@ -284,12 +284,14 @@ void __init omap_dsp_reserve_sdram_memblock(void) if (!size) return; - paddr = __memblock_alloc_base(size, SZ_1M, MEMBLOCK_REAL_LIMIT); + paddr = memblock_alloc(size, SZ_1M); if (!paddr) { pr_err("%s: failed to reserve %x bytes\n", __func__, size); return; } + memblock_free(paddr, size); + memblock_remove(paddr, size); omap_dsp_phys_mempool_base = paddr; } |