diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-27 07:50:22 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-27 07:50:22 +0400 |
| commit | 2b37e9a28afbd11f899738e912fb4a617a74b462 (patch) | |
| tree | 9494e8bfed44e08f47d4b4c6007dc189f7c7896f /arch/microblaze/lib/uaccess_old.S | |
| parent | a9a07d40bc9c57881555b64fe8bf66fd28e2f13a (diff) | |
| parent | 711e5b4520986380700e6f095608021cf087170e (diff) | |
| download | linux-2b37e9a28afbd11f899738e912fb4a617a74b462.tar.xz | |
Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze
Pull microblaze update from Michal Simek:
"Microblaze changes.
After my discussion with Arnd I have also added there asm-generic io
patch which is Acked by him and Geert."
* 'next' of git://git.monstr.eu/linux-2.6-microblaze:
asm-generic: io: Fix ioread16/32be and iowrite16/32be
microblaze: Do not use module.h in files which are not modules
microblaze: Fix coding style issues
microblaze: Add missing return from debugfs_tlb
microblaze: Makefile clean
microblaze: Add .gitignore entries for auto-generated files
microblaze: Fix strncpy_from_user macro
Diffstat (limited to 'arch/microblaze/lib/uaccess_old.S')
| -rw-r--r-- | arch/microblaze/lib/uaccess_old.S | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/arch/microblaze/lib/uaccess_old.S b/arch/microblaze/lib/uaccess_old.S index f085995ee848..0e8cc2710c27 100644 --- a/arch/microblaze/lib/uaccess_old.S +++ b/arch/microblaze/lib/uaccess_old.S @@ -38,15 +38,14 @@ __strncpy_user: addik r3,r7,0 /* temp_count = len */ 1: lbu r4,r6,r0 + beqid r4,2f sb r4,r5,r0 - addik r3,r3,-1 - beqi r3,2f /* break on len */ - addik r5,r5,1 - bneid r4,1b addik r6,r6,1 /* delay slot */ - addik r3,r3,1 /* undo "temp_count--" */ + + addik r3,r3,-1 + bnei r3,1b /* break on len */ 2: rsubk r3,r3,r7 /* temp_count = len - temp_count */ 3: |