diff options
| author | Michal Simek <monstr@monstr.eu> | 2012-10-09 09:32:32 +0200 |
|---|---|---|
| committer | Michal Simek <michal.simek@xilinx.com> | 2012-11-15 11:56:27 +0100 |
| commit | fd11ff7380fe7c61f55e6caf33982edeab3fbc19 (patch) | |
| tree | 4a5bc8e2e530812d257320a5d88a7b3ccbc6e30b | |
| parent | 77b67063bb6bce6d475e910d3b886a606d0d91f7 (diff) | |
| download | linux-3.10-fd11ff7380fe7c61f55e6caf33982edeab3fbc19.tar.gz linux-3.10-fd11ff7380fe7c61f55e6caf33982edeab3fbc19.tar.bz2 linux-3.10-fd11ff7380fe7c61f55e6caf33982edeab3fbc19.zip | |
microblaze: Fix bug with schedule_tail
Signed-off-by: Michal Simek <monstr@monstr.eu>
| -rw-r--r-- | arch/microblaze/kernel/entry.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/microblaze/kernel/entry.S b/arch/microblaze/kernel/entry.S index 03f7b8ce6b6..1cf702ab746 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. */ |