xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge tag 'for-linus' of git://github.com/openrisc/linux

Browse Source 
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
This commit is contained in:
Linus Torvalds
2019-01-01 15:35:55 -08:00
parent 28e8c4bc8e 57ce8ba0fd
commit fbea8c7c79
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/openrisc/kernel/entry.S
View File

@@ -240,7 +240,7 @@ handler: ;\
* occured. in fact they never do. if you need them use * occured. in fact they never do. if you need them use
* values saved on stack (for SPR_EPC, SPR_ESR) or content * values saved on stack (for SPR_EPC, SPR_ESR) or content
* of r4 (for SPR_EEAR). for details look at EXCEPTION_HANDLE() * of r4 (for SPR_EEAR). for details look at EXCEPTION_HANDLE()
* in 'arch/or32/kernel/head.S' * in 'arch/openrisc/kernel/head.S'
*/ */
/* =====================================================[ exceptions] === */ /* =====================================================[ exceptions] === */

2
arch/openrisc/kernel/head.S
View File

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