Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fbea8c7c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 28e8c4bc 57ce8ba0

arch/openrisc/kernel/entry.S

+1 −1
Original line number Diff line number Diff line
@@ -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] === */

arch/openrisc/kernel/head.S

+1 −1
Original line number Diff line number Diff line
@@ -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