diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-06-04 08:04:10 +0900 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-06-04 08:04:10 +0900 |
| commit | 39b4a46f19295b4876fba6655f27d67232dc6a1f (patch) | |
| tree | d30a6312bf61fa987774707331c2434d9ebd0198 | |
| parent | cb37bbd90a11003993d47c395837e0f87abf1b31 (diff) | |
| parent | 5ff6197f828d5ea051b3abf77cb61f8a34480e8d (diff) | |
| download | linux-3.10-39b4a46f19295b4876fba6655f27d67232dc6a1f.tar.gz linux-3.10-39b4a46f19295b4876fba6655f27d67232dc6a1f.tar.bz2 linux-3.10-39b4a46f19295b4876fba6655f27d67232dc6a1f.zip | |
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 f3931d50b4a..2c07dddac99 100644 --- a/arch/blackfin/lib/strncpy.S +++ b/arch/blackfin/lib/strncpy.S @@ -25,7 +25,7 @@ ENTRY(_strncpy) CC = R2 == 0; - if CC JUMP 4f; + if CC JUMP 6f; P2 = R2 ; /* size */ P0 = R0 ; /* dst*/ |