diff options
| author | Santosh Shilimkar <santosh.shilimkar@ti.com> | 2012-02-02 19:33:55 +0530 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-02-14 11:42:42 -0800 |
| commit | 2ec1fc4e169acc0b8d6733ff028fd52e766773d9 (patch) | |
| tree | 62c8f98055416777963a1465227e0df434db1b9e /arch/arm/plat-omap | |
| parent | 1e056dddabc1b7a909d1f992fefb1d5d5bc8ff0d (diff) | |
| download | linux-2ec1fc4e169acc0b8d6733ff028fd52e766773d9.tar.gz linux-2ec1fc4e169acc0b8d6733ff028fd52e766773d9.tar.bz2 linux-2ec1fc4e169acc0b8d6733ff028fd52e766773d9.zip | |
ARM: OMAP4: Move the barrier memboclk_steal() as part of reserve callback
arm_memblock_steal() is not suppose to be used outside ->reserve callback.
OMAP barrier errata code was using it outside reserve callback and hence
it was broken.
Move the allocation as part of ->reserve callback to fix the it.
Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/plat-omap')
| -rw-r--r-- | arch/arm/plat-omap/common.c | 1 | ||||
| -rw-r--r-- | arch/arm/plat-omap/include/plat/omap-secure.h | 6 |
2 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/plat-omap/common.c b/arch/arm/plat-omap/common.c index 06383b51e655..4de7d1e79e73 100644 --- a/arch/arm/plat-omap/common.c +++ b/arch/arm/plat-omap/common.c @@ -69,6 +69,7 @@ void __init omap_reserve(void) omap_vram_reserve_sdram_memblock(); omap_dsp_reserve_sdram_memblock(); omap_secure_ram_reserve_memblock(); + omap_barrier_reserve_memblock(); } void __init omap_init_consistent_dma_size(void) diff --git a/arch/arm/plat-omap/include/plat/omap-secure.h b/arch/arm/plat-omap/include/plat/omap-secure.h index 3047ff923a63..8c7994ce9869 100644 --- a/arch/arm/plat-omap/include/plat/omap-secure.h +++ b/arch/arm/plat-omap/include/plat/omap-secure.h @@ -10,4 +10,10 @@ static inline void omap_secure_ram_reserve_memblock(void) { } #endif +#ifdef CONFIG_OMAP4_ERRATA_I688 +extern int omap_barrier_reserve_memblock(void); +#else +static inline void omap_barrier_reserve_memblock(void) +{ } +#endif #endif /* __OMAP_SECURE_H__ */ |