lkml.org 
[lkml]   [2018]   [Mar]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.4 31/63] ARM: omap2: hide omap3_save_secure_ram on non-OMAP3 builds
    Date
    4.4-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Arnd Bergmann <arnd@arndb.de>

    commit 863204cfdae98626a92535ac928ad79f4d6b74ff upstream.

    In configurations without CONFIG_OMAP3 but with secure RAM support,
    we now run into a link failure:

    arch/arm/mach-omap2/omap-secure.o: In function `omap3_save_secure_ram':
    omap-secure.c:(.text+0x130): undefined reference to `save_secure_ram_context'

    The omap3_save_secure_ram() function is only called from the OMAP34xx
    power management code, so we can simply hide that function in the
    appropriate #ifdef.

    Fixes: d09220a887f7 ("ARM: OMAP2+: Fix SRAM virt to phys translation for save_secure_ram_context")
    Acked-by: Tony Lindgren <tony@atomide.com>
    Tested-by: Dan Murphy <dmurphy@ti.com>
    Signed-off-by: Arnd Bergmann <arnd@arndb.de>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    arch/arm/mach-omap2/omap-secure.c | 2 ++
    1 file changed, 2 insertions(+)

    --- a/arch/arm/mach-omap2/omap-secure.c
    +++ b/arch/arm/mach-omap2/omap-secure.c
    @@ -73,6 +73,7 @@ phys_addr_t omap_secure_ram_mempool_base
    return omap_secure_memblock_base;
    }

    +#if defined(CONFIG_ARCH_OMAP3) && defined(CONFIG_PM)
    u32 omap3_save_secure_ram(void __iomem *addr, int size)
    {
    u32 ret;
    @@ -91,6 +92,7 @@ u32 omap3_save_secure_ram(void __iomem *

    return ret;
    }
    +#endif

    /**
    * rx51_secure_dispatcher: Routine to dispatch secure PPA API calls

    \
     
     \ /
      Last update: 2018-03-16 18:31    [W:2.129 / U:0.012 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site