2018-12-03 12:22:08

by Geert Uytterhoeven

Subject: [PATCH resend] openrisc: Fix broken paths to arch/or32

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

Signed-off-by: Geert Uytterhoeven <[email protected]>
---
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 0c826ad6e994cce3..ee6159d2ed22ec49 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 9fc6b60140f007be..31ed257ff06188ee 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.17.1

2018-12-19 15:58:24

by Stafford Horne

Subject: Re: [PATCH resend] openrisc: Fix broken paths to arch/or32

On Mon, Dec 03, 2018 at 01:20:47PM +0100, Geert Uytterhoeven wrote:
> OpenRISC was mainlined as "openrisc", not "or32".
> vmlinux.lds is generated from vmlinux.lds.S.
>
> Signed-off-by: Geert Uytterhoeven <[email protected]>

Thanks,

Sorry for the delay.

I will queue this up.

-Stafford

> ---
> 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 0c826ad6e994cce3..ee6159d2ed22ec49 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 9fc6b60140f007be..31ed257ff06188ee 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.17.1
>