summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsteve@digidescorp.com <steve@digidescorp.com>2009-12-09 17:13:42 -0600
committerMichal Simek <monstr@monstr.eu>2009-12-14 08:45:11 +0100
commit825c9a359ecd6ba2569e6c38199e7d072ab388e3 (patch)
tree3211fe2d908e4cc5c624f3b9ca46c65f83c94470
parent233eb92115c87bc3bbfab99e3e198654acf4cd58 (diff)
downloadlinux-825c9a359ecd6ba2569e6c38199e7d072ab388e3.tar.bz2
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: Steven J. Magnani <steve@digidescorp.com> Signed-off-by: Michal Simek <monstr@monstr.eu>
-rw-r--r--arch/microblaze/kernel/entry-nommu.S2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/microblaze/kernel/entry-nommu.S b/arch/microblaze/kernel/entry-nommu.S
index 9083d85376a4..95b0855802df 100644
--- a/arch/microblaze/kernel/entry-nommu.S
+++ b/arch/microblaze/kernel/entry-nommu.S
@@ -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 */