From 70e192d85d597a5224502b8f46ca448c96d914dd Mon Sep 17 00:00:00 2001
From: Michal Simek <monstr@monstr.eu>
Date: Fri, 10 Jun 2011 11:03:44 +0200
Subject: [PATCH] --- yaml --- r: 272031 b: refs/heads/master c:
 9b133f8d87a460e97b63efbf421a87741a029cd0 h: refs/heads/master i:   272029:
 3fd1ede33f4015a543c1b911e71acdced5bf0781   272027:
 c90f0e46bbdb45d8129d5d07b64331020c670e36   272023:
 922798549a574b361031cae162f4c49c9ab8ab25   272015:
 a28e0aacc3b5d9f3f0a03225d5f3c11dbcc6182e   271999:
 4e30b8318ec9359306401c718439f8d8485f6712 v: v3

---
 [refs]                                  | 2 +-
 trunk/arch/microblaze/lib/uaccess_old.S | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 171722b4ed7c..d6722732aa5e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9c6f6f549f46940c2d48eb9618d9d0fe471c5151
+refs/heads/master: 9b133f8d87a460e97b63efbf421a87741a029cd0
diff --git a/trunk/arch/microblaze/lib/uaccess_old.S b/trunk/arch/microblaze/lib/uaccess_old.S
index 5810cec54a7a..5b6d69e07968 100644
--- a/trunk/arch/microblaze/lib/uaccess_old.S
+++ b/trunk/arch/microblaze/lib/uaccess_old.S
@@ -119,7 +119,7 @@ __copy_tofrom_user:
 	 * r7, r3 - count
 	 * r4 - tempval
 	 */
-	beqid	r7, 3f /* zero size is not likely */
+	beqid	r7, 0f /* zero size is not likely */
 	andi	r3, r7, 0x3 /* filter add count */
 	bneid	r3, 4f /* if is odd value then byte copying */
 	or	r3, r5, r6 /* find if is any to/from unaligned */
@@ -142,11 +142,11 @@ __copy_tofrom_user:
 	addik	r7,r7,-1
 	bneid	r7,1b
 	addik	r3,r3,1		/* delay slot */
-3:
+0:
 	addik	r3,r7,0
 	rtsd	r15,8
 	nop
 	.size   __copy_tofrom_user, . - __copy_tofrom_user
 
 	.section	__ex_table,"a"
-	.word	1b,3b,2b,3b,5b,3b,6b,3b
+	.word	1b,0b,2b,0b,5b,0b,6b,0b