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

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

Pull OpenRISC fixes from Stafford Horne:

 - Fix from Masahiro Yamada to fix 6.13 OpenRISC boot issues after
   vmlinux.lds.h symbol ordering was changed

 - Code formatting fixups from Geert

* tag 'for-linus' of https://github.com/openrisc/linux:
  openrisc: Fix misalignments in head.S
  openrisc: place exception table at the head of vmlinux
parents 150b567e c8f8d434

arch/openrisc/kernel/entry.S

+2 −0
Original line number Diff line number Diff line
@@ -239,6 +239,8 @@ handler: ;\ 


/* =====================================================[ exceptions] === */



	__REF



/* ---[ 0x100: RESET exception ]----------------------------------------- */



EXCEPTION_ENTRY(_tng_kernel_start)

arch/openrisc/kernel/head.S

+17 −15
Original line number Diff line number Diff line
@@ -357,6 +357,8 @@ 


/* =====================================================[ exceptions] === */



	__HEAD



/* ---[ 0x100: RESET exception ]----------------------------------------- */

    .org 0x100

	/* Jump to .init code at _start which lives in the .head section
@@ -394,7 +396,7 @@ _dispatch_do_ipage_fault: 
    .org 0x500

	EXCEPTION_HANDLE(_timer_handler)



/* ---[ 0x600: Alignment exception ]-------------------------------------- */

/* ---[ 0x600: Alignment exception ]------------------------------------- */

    .org 0x600

	EXCEPTION_HANDLE(_alignment_handler)
@@ -424,7 +426,7 @@ _dispatch_do_ipage_fault: 
    .org 0xc00

	EXCEPTION_HANDLE(_sys_call_handler)



/* ---[ 0xd00: Floating point exception ]--------------------------------- */

/* ---[ 0xd00: Floating point exception ]-------------------------------- */

    .org 0xd00

	EXCEPTION_HANDLE(_fpe_trap_handler)
@@ -506,10 +508,10 @@ _dispatch_do_ipage_fault: 


/*    .text*/



/* This early stuff belongs in HEAD, but some of the functions below definitely

/* This early stuff belongs in the .init.text section, but some of the functions below definitely

 * don't... */



	__HEAD

	__INIT

	.global _start

_start:

	/* Init r0 to zero as per spec */
@@ -816,7 +818,7 @@ secondary_start: 


#endif



/* ========================================[ cache ]=== */

/* ==========================================================[ cache ]=== */



	/* alignment here so we don't change memory offsets with

	 * memory controller defined

arch/openrisc/kernel/vmlinux.lds.S

+1 −2
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ SECTIONS 
        .text                   : AT(ADDR(.text) - LOAD_OFFSET)

	{

          _stext = .;

	  HEAD_TEXT

	  TEXT_TEXT

	  SCHED_TEXT

	  LOCK_TEXT
@@ -83,8 +84,6 @@ SECTIONS 
	. = ALIGN(PAGE_SIZE);

	__init_begin = .;



	HEAD_TEXT_SECTION



	/* Page aligned */

	INIT_TEXT_SECTION(PAGE_SIZE)

scripts/head-object-list.txt

+0 −1
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ arch/m68k/kernel/head.o 
arch/m68k/kernel/sun3-head.o

arch/microblaze/kernel/head.o

arch/nios2/kernel/head.o

arch/openrisc/kernel/head.o

arch/parisc/kernel/head.o

arch/powerpc/kernel/head_44x.o

arch/powerpc/kernel/head_64.o