diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-04-19 01:55:58 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-04-19 01:56:17 -0400 |
| commit | 68d2cf25d39324c54b5e42de7915c623a0917abe (patch) | |
| tree | ff1291450d7e6630bc77ec1363c3db8d74fa58b0 /arch/cris/arch-v32/kernel/entry.S | |
| parent | 176fcc5c5f0131504a55e1e1d35389c49a9177c2 (diff) | |
| parent | 5d2cd90922c778908bd0cd669e572a5b5eafd737 (diff) | |
Merge branch 'perf/urgent' into perf/core
Merge reason: we'll be queueing up dependent changes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/cris/arch-v32/kernel/entry.S')
| -rw-r--r-- | arch/cris/arch-v32/kernel/entry.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/cris/arch-v32/kernel/entry.S b/arch/cris/arch-v32/kernel/entry.S index 0ecb50b8f0d9..3abf12c23e5f 100644 --- a/arch/cris/arch-v32/kernel/entry.S +++ b/arch/cris/arch-v32/kernel/entry.S | |||
| @@ -182,7 +182,7 @@ _syscall_traced: | |||
| 182 | move.d $r0, [$sp] | 182 | move.d $r0, [$sp] |
| 183 | 183 | ||
| 184 | ;; The registers carrying parameters (R10-R13) are intact. The optional | 184 | ;; The registers carrying parameters (R10-R13) are intact. The optional |
| 185 | ;; fifth and sixth parameters is in MOF and SRP respectivly. Put them | 185 | ;; fifth and sixth parameters is in MOF and SRP respectively. Put them |
| 186 | ;; back on the stack. | 186 | ;; back on the stack. |
| 187 | subq 4, $sp | 187 | subq 4, $sp |
| 188 | move $srp, [$sp] | 188 | move $srp, [$sp] |