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

Commit f131a080 authored by Russell King's avatar Russell King
Browse files

ARM: no need for nommu to jump through the hoops that mmu does 



nommu can jump directly to __mmap_switched without the absolute
address branching which the mmuful kernel does.

Acked-by: default avatarGreg Ungerer <gerg@uclinux.org>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 2bfc96a1

arch/arm/kernel/head-nommu.S

+1 −4
Original line number Diff line number Diff line
@@ -48,8 +48,6 @@ ENTRY(stext) 
	movs	r8, r5				@ invalid machine (r5=0)?

	beq	__error_a			@ yes, error 'a'



	ldr	r13, __switch_data		@ address to jump to after

						@ the initialization is done

	adr	lr, BSYM(__after_proc_init)	@ return (PIC) address

 ARM(	add	pc, r10, #PROCINFO_INITFUNC	)

 THUMB(	add	r12, r10, #PROCINFO_INITFUNC	)
@@ -87,8 +85,7 @@ __after_proc_init: 
	mcr	p15, 0, r0, c1, c0, 0		@ write control reg

#endif /* CONFIG_CPU_CP15 */



	mov	r3, r13

	mov	pc, r3				@ clear the BSS and jump

	b	__mmap_switched			@ clear the BSS and jump

						@ to start_kernel

ENDPROC(__after_proc_init)

	.ltorg