summaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-omap/include/plat/omap-secure.h
diff options
context:
space:
mode:
authorSantosh Shilimkar <santosh.shilimkar@ti.com>2012-02-02 19:33:55 +0530
committerTony Lindgren <tony@atomide.com>2012-02-14 11:42:42 -0800
commit2ec1fc4e169acc0b8d6733ff028fd52e766773d9 (patch)
tree62c8f98055416777963a1465227e0df434db1b9e /arch/arm/plat-omap/include/plat/omap-secure.h
parent1e056dddabc1b7a909d1f992fefb1d5d5bc8ff0d (diff)
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/include/plat/omap-secure.h')
-rw-r--r--arch/arm/plat-omap/include/plat/omap-secure.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/plat-omap/include/plat/omap-secure.h b/arch/arm/plat-omap/include/plat/omap-secure.h
index 3047ff923a6..8c7994ce986 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__ */