lkml.org 
[lkml]   [2013]   [Jul]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[ 67/72] ARM: mm: fix boot on SA1110 Assabet
    Date
    3.10-stable review patch.  If anyone has any objections, please let me know.

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

    From: Russell King <rmk+kernel@arm.linux.org.uk>

    commit 319e0b4f02f73983c03a2ca38595fc6367929edf upstream.

    Commit 83db0384 (mm/ARM: use common help functions to free reserved
    pages) broke booting on the Assabet by trying to convert a PFN to
    a virtual address using the __va() macro. This macro takes the
    physical address, not a PFN. Fix this.

    Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    arch/arm/mm/init.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    --- a/arch/arm/mm/init.c
    +++ b/arch/arm/mm/init.c
    @@ -600,7 +600,7 @@ void __init mem_init(void)

    #ifdef CONFIG_SA1111
    /* now that our DMA memory is actually so designated, we can free it */
    - free_reserved_area(__va(PHYS_PFN_OFFSET), swapper_pg_dir, 0, NULL);
    + free_reserved_area(__va(PHYS_OFFSET), swapper_pg_dir, 0, NULL);
    #endif

    free_highpages();



    \
     
     \ /
      Last update: 2013-07-19 08:21    [W:4.192 / U:0.064 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site