diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /arch/blackfin/lib/memmove.S | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'arch/blackfin/lib/memmove.S')
| -rw-r--r-- | arch/blackfin/lib/memmove.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/blackfin/lib/memmove.S b/arch/blackfin/lib/memmove.S index 80c240acac60..4eca566237a4 100644 --- a/arch/blackfin/lib/memmove.S +++ b/arch/blackfin/lib/memmove.S | |||
| @@ -60,7 +60,7 @@ ENTRY(_memmove) | |||
| 60 | [P0++] = R1; | 60 | [P0++] = R1; |
| 61 | 61 | ||
| 62 | CC = P2 == 0; /* any remaining bytes? */ | 62 | CC = P2 == 0; /* any remaining bytes? */ |
| 63 | P3 = I0; /* Ammend P3 to updated ptr. */ | 63 | P3 = I0; /* Amend P3 to updated ptr. */ |
| 64 | IF !CC JUMP .Lbytes; | 64 | IF !CC JUMP .Lbytes; |
| 65 | P3 = I1; | 65 | P3 = I1; |
| 66 | RTS; | 66 | RTS; |