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/strncpy.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/strncpy.S')
| -rw-r--r-- | arch/blackfin/lib/strncpy.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/blackfin/lib/strncpy.S b/arch/blackfin/lib/strncpy.S index f3931d50b4a7..2c07dddac995 100644 --- a/arch/blackfin/lib/strncpy.S +++ b/arch/blackfin/lib/strncpy.S | |||
| @@ -25,7 +25,7 @@ | |||
| 25 | 25 | ||
| 26 | ENTRY(_strncpy) | 26 | ENTRY(_strncpy) |
| 27 | CC = R2 == 0; | 27 | CC = R2 == 0; |
| 28 | if CC JUMP 4f; | 28 | if CC JUMP 6f; |
| 29 | 29 | ||
| 30 | P2 = R2 ; /* size */ | 30 | P2 = R2 ; /* size */ |
| 31 | P0 = R0 ; /* dst*/ | 31 | P0 = R0 ; /* dst*/ |