---

yaml --- r: 272034 b: refs/heads/master c: 782d491 h: refs/heads/master v: v3
git-mirror · Oct 14, 2011 · 682e844 · 682e844
1 parent 38c9de4
commit 682e844
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c83858b3e6e8db9dbb17641de1a2420bb102ae31
+refs/heads/master: 782d491fc210fac03976d01071145728339b6887
diff --git a/trunk/arch/microblaze/lib/uaccess_old.S b/trunk/arch/microblaze/lib/uaccess_old.S
@@ -120,11 +120,10 @@ __copy_tofrom_user:
 	 * r4 - tempval
 	 */
 	beqid	r7, 0f /* zero size is not likely */
-	andi	r3, r7, 0x3 /* filter add count */
-	bneid	r3, bu /* if is odd value then byte copying */
 	or	r3, r5, r6 /* find if is any to/from unaligned */
-	andi	r3, r3, 0x3 /* mask unaligned */
-	bneid	r3, bu1 /* it is unaligned -> then jump */
+	or	r3, r3, r7 /* find if count is unaligned */
+	andi	r3, r3, 0x3 /* mask last 3 bits */
+	bneid	r3, bu1 /* if r3 is not zero then byte copying */
 	or	r3, r0, r0
 
 w1:	lw	r4, r6, r3 /* at least one 4 byte copy */
@@ -141,7 +140,6 @@ w2:	sw	r4, r5, r3
 	.word	w2, 0f;
 	.text
 
-bu:	or	r3, r0, r0
 bu1:	lbu	r4,r6,r3
 bu2:	sb	r4,r5,r3
 	addik	r7,r7,-1