From 682e844fd5c24011342bdaf26db14100746cf771 Mon Sep 17 00:00:00 2001 From: Michal Simek Date: Fri, 10 Jun 2011 11:08:57 +0200 Subject: [PATCH] --- yaml --- r: 272034 b: refs/heads/master c: 782d491fc210fac03976d01071145728339b6887 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/microblaze/lib/uaccess_old.S | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 6328807ce7ad..345d309a25d7 100644 --- 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 index 6dfd4a087263..d09f2dce648d 100644 --- 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