diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-01-01 15:35:55 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-01-01 15:35:55 -0800 |
| commit | fbea8c7c793397cdf4ba53a32f99b656467b7c7f (patch) | |
| tree | 974405ff6b7e0b7cbf80e35a66b35bfbbc97b46d | |
| parent | 28e8c4bc8eb483c22d977e147a0b98fc63efadf7 (diff) | |
| parent | 57ce8ba0fd3a95bf29ed741df1c52bd591bf43ff (diff) | |
| download | linux-fbea8c7c793397cdf4ba53a32f99b656467b7c7f.tar.bz2 | |
Merge tag 'for-linus' of git://github.com/openrisc/linux
Pull OpenRISC update from Stafford Horne:
"Just one change for 4.21: Update comments for name change or32 -> or1k
from Geert Uytterhoeven"
* tag 'for-linus' of git://github.com/openrisc/linux:
openrisc: Fix broken paths to arch/or32
| -rw-r--r-- | arch/openrisc/kernel/entry.S | 2 | ||||
| -rw-r--r-- | 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 0c826ad6e994..ee6159d2ed22 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 9fc6b60140f0..31ed257ff061 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 |