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

Commit 825c9a35 authored by steve@digidescorp.com's avatar steve@digidescorp.com Committed by Michal Simek
Browse files

microblaze: nommu: Don't clobber R11 on syscalls 



The noMMU syscall trap has a bug that causes R11 to be zero on return to
userland. Remove the extra "save" of R11 responsible for the bug.

Remove reloading of mode indicator because r11 already contains it.

Signed-off-by: default avatarSteven J. Magnani <steve@digidescorp.com>
Signed-off-by: default avatarMichal Simek <monstr@monstr.eu>
parent 233eb921

arch/microblaze/kernel/entry-nommu.S

+0 −2
Original line number Diff line number Diff line
@@ -208,8 +208,6 @@ ENTRY(_user_exception) 
	lwi	r1, r1, TS_THREAD_INFO		/* get the thread info */

	/* calculate kernel stack pointer */

	addik	r1, r1, THREAD_SIZE - PT_SIZE

	swi	r11, r0, PER_CPU(R11_SAVE)	/* temporarily save r11 */

	lwi	r11, r0, PER_CPU(KM)		/* load mode indicator */

2:

	swi	r11, r1, PT_MODE		/* store the mode */

	lwi	r11, r0, PER_CPU(R11_SAVE)	/* reload r11 */