From: Michal Simek Date: Tue, 9 Oct 2012 07:32:32 +0000 (+0200) Subject: microblaze: Fix bug with schedule_tail X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=fd11ff7380fe7c61f55e6caf33982edeab3fbc19;p=deliverable%2Flinux.git microblaze: Fix bug with schedule_tail Signed-off-by: Michal Simek --- 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. */