lkml.org 
[lkml]   [2019]   [Dec]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 157/321] openrisc: Fix broken paths to arch/or32
    Date
    From: Geert Uytterhoeven <geert@linux-m68k.org>

    [ Upstream commit 57ce8ba0fd3a95bf29ed741df1c52bd591bf43ff ]

    OpenRISC was mainlined as "openrisc", not "or32".
    vmlinux.lds is generated from vmlinux.lds.S.

    Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
    Signed-off-by: Stafford Horne <shorne@gmail.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    arch/openrisc/kernel/entry.S | 2 +-
    arch/openrisc/kernel/head.S | 2 +-
    2 files changed, 2 insertions(+), 2 deletions(-)

    diff --git a/arch/openrisc/kernel/entry.S b/arch/openrisc/kernel/entry.S
    index 0c826ad6e994c..ee6159d2ed22e 100644
    --- a/arch/openrisc/kernel/entry.S
    +++ b/arch/openrisc/kernel/entry.S
    @@ -240,7 +240,7 @@ handler: ;\
    * occured. in fact they never do. if you need them use
    * values saved on stack (for SPR_EPC, SPR_ESR) or content
    * of r4 (for SPR_EEAR). for details look at EXCEPTION_HANDLE()
    - * in 'arch/or32/kernel/head.S'
    + * in 'arch/openrisc/kernel/head.S'
    */

    /* =====================================================[ exceptions] === */
    diff --git a/arch/openrisc/kernel/head.S b/arch/openrisc/kernel/head.S
    index 9fc6b60140f00..31ed257ff0618 100644
    --- a/arch/openrisc/kernel/head.S
    +++ b/arch/openrisc/kernel/head.S
    @@ -1728,7 +1728,7 @@ _string_nl:

    /*
    * .data section should be page aligned
    - * (look into arch/or32/kernel/vmlinux.lds)
    + * (look into arch/openrisc/kernel/vmlinux.lds.S)
    */
    .section .data,"aw"
    .align 8192
    --
    2.20.1


    \
     
     \ /
      Last update: 2019-12-03 23:53    [W:2.229 / U:0.220 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site