summaryrefslogtreecommitdiffstats
path: root/arch/microblaze
diff options
context:
space:
mode:
authorMichal Simek <monstr@monstr.eu>2012-10-09 09:32:32 +0200
committerMichal Simek <michal.simek@xilinx.com>2012-11-15 11:56:27 +0100
commitfd11ff7380fe7c61f55e6caf33982edeab3fbc19 (patch)
tree4a5bc8e2e530812d257320a5d88a7b3ccbc6e30b /arch/microblaze
parentLinux 3.7-rc5 (diff)
downloadlinux-fd11ff7380fe7c61f55e6caf33982edeab3fbc19.tar.xz
linux-fd11ff7380fe7c61f55e6caf33982edeab3fbc19.zip
microblaze: Fix bug with schedule_tail
Signed-off-by: Michal Simek <monstr@monstr.eu>
Diffstat (limited to 'arch/microblaze')
-rw-r--r--arch/microblaze/kernel/entry.S2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/microblaze/kernel/entry.S b/arch/microblaze/kernel/entry.S
index 03f7b8ce6b6b..1cf702ab7463 100644
--- a/arch/microblaze/kernel/entry.S
+++ b/arch/microblaze/kernel/entry.S
@@ -479,7 +479,7 @@ C_ENTRY(sys_fork_wrapper):
saved context). */
C_ENTRY(ret_from_fork):
bralid r15, schedule_tail; /* ...which is schedule_tail's arg */
- add r3, r5, r0; /* switch_thread returns the prev task */
+ add r5, r3, r0; /* switch_thread returns the prev task */
/* ( in the delay slot ) */
brid ret_from_trap; /* Do normal trap return */
add r3, r0, r0; /* Child's fork call should return 0. */