diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-06-03 19:04:10 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-06-03 19:04:10 -0400 |
| commit | 39b4a46f19295b4876fba6655f27d67232dc6a1f (patch) | |
| tree | d30a6312bf61fa987774707331c2434d9ebd0198 | |
| parent | cb37bbd90a11003993d47c395837e0f87abf1b31 (diff) | |
| parent | 5ff6197f828d5ea051b3abf77cb61f8a34480e8d (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin:
Blackfin: strncpy: fix handling of zero lengths
| -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*/ |