commit 39b4a46f19295b4876fba6655f27d67232dc6a1f
author Linus Torvalds <torvalds@linux-foundation.org> Sat Jun 04 08:04:10 2011 +0900
committer Linus Torvalds <torvalds@linux-foundation.org> Sat Jun 04 08:04:10 2011 +0900
tree d30a6312bf61fa987774707331c2434d9ebd0198
parent cb37bbd90a11003993d47c395837e0f87abf1b31
parent 5ff6197f828d5ea051b3abf77cb61f8a34480e8d

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

arch/blackfin/lib/strncpy.S

diff --git a/arch/blackfin/lib/strncpy.S b/arch/blackfin/lib/strncpy.S
index f3931d5..2c07ddd 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*/