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

Commit 5e588114 authored by Nicolas Pitre's avatar Nicolas Pitre
Browse files

ARM: start_thread(): don't always clear all regs 



The elf_fdpic binary format driver has to initialize extra registers
beside the stack and program counter as required by the corresponding
ABI. So reinstate them after the regs structure has been cleared.

While at it let's get rid of start_thread_nommu().

Signed-off-by: default avatarNicolas Pitre <nico@linaro.org>
Acked-by: default avatarMickael GUENE <mickael.guene@st.com>
Tested-by: default avatarVincent Abriou <vincent.abriou@st.com>
Tested-by: default avatarAndras Szemzo <szemzo.andras@gmail.com>
parent e71fd631

arch/arm/include/asm/processor.h

+15 −7
Original line number Diff line number Diff line
@@ -47,15 +47,24 @@ struct thread_struct { 


#define INIT_THREAD  {	}



#ifdef CONFIG_MMU

#define nommu_start_thread(regs) do { } while (0)

#else

#define nommu_start_thread(regs) regs->ARM_r10 = current->mm->start_data

#endif



#define start_thread(regs,pc,sp)					\

({									\

	unsigned long r7, r8, r9;					\

									\

	if (IS_ENABLED(CONFIG_BINFMT_ELF_FDPIC)) {			\

		r7 = regs->ARM_r7;					\

		r8 = regs->ARM_r8;					\

		r9 = regs->ARM_r9;					\

	}								\

	memset(regs->uregs, 0, sizeof(regs->uregs));			\

	if (IS_ENABLED(CONFIG_BINFMT_ELF_FDPIC) &&			\

	    current->personality & FDPIC_FUNCPTRS) {			\

		regs->ARM_r7 = r7;					\

		regs->ARM_r8 = r8;					\

		regs->ARM_r9 = r9;					\

		regs->ARM_r10 = current->mm->start_data;		\

	} else if (!IS_ENABLED(CONFIG_MMU))				\

		regs->ARM_r10 = current->mm->start_data;		\

	if (current->personality & ADDR_LIMIT_32BIT)			\

		regs->ARM_cpsr = USR_MODE;				\

	else								\
@@ -65,7 +74,6 @@ struct thread_struct { 
	regs->ARM_cpsr |= PSR_ENDSTATE;					\

	regs->ARM_pc = pc & ~1;		/* pc */			\

	regs->ARM_sp = sp;		/* sp */			\

	nommu_start_thread(regs);					\

})



/* Forward declaration, a strange C thing */