diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-11-11 14:12:34 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-11-11 14:14:54 +0100 |
| commit | 94fb7c9c5d40edd538d7f2e048af5ab9ff55ef73 (patch) | |
| tree | 19a48a7033656bcdcbbaabf8cb6347562a2d1a94 /arch | |
| parent | Staging: keucr driver: fix uninitialized variable & proper memset length (diff) | |
| parent | Revert "staging: tidspbridge: replace iommu custom for opensource implementat... (diff) | |
| download | linux-94fb7c9c5d40edd538d7f2e048af5ab9ff55ef73.tar.xz linux-94fb7c9c5d40edd538d7f2e048af5ab9ff55ef73.zip | |
Staging: Merge 'tidspbridge-2.6.37-rc1' into staging-linus
This is a big revert of a lot of -rc1 tidspbridge patches in order to
get the driver back into a working state. It also includes a OMAP patch
that was approved by the OMAP maintainer.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'arch')
| -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; } |