diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-02-17 17:51:27 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-02-17 17:51:27 -0800 |
| commit | a0aeccdc694d5db3b4310a6ed1ce4f88974cf7b4 (patch) | |
| tree | 2a4e8f8a2641eccd96d5d2aa58d9cf5aa6546c4c /arch/sparc/kernel/una_asm_32.S | |
| parent | fa7ea87a057958a8b7926c1a60a3ca6d696328ed (diff) | |
| parent | b62818e5ff78cab4daf04fc0c12f86475dbc4b69 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
sparc64: Fix NMI startup bug which also breaks perf.
sparc: fix size argument to find_next_zero_bit()
sparc: use bitmap_set()
sparc32: unaligned memory access (MNA) trap handler bug
Diffstat (limited to 'arch/sparc/kernel/una_asm_32.S')
| -rw-r--r-- | arch/sparc/kernel/una_asm_32.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sparc/kernel/una_asm_32.S b/arch/sparc/kernel/una_asm_32.S index 8cc03458eb7e..8f096e84a937 100644 --- a/arch/sparc/kernel/una_asm_32.S +++ b/arch/sparc/kernel/una_asm_32.S @@ -24,9 +24,9 @@ retl_efault: .globl __do_int_store __do_int_store: ld [%o2], %g1 - cmp %1, 2 + cmp %o1, 2 be 2f - cmp %1, 4 + cmp %o1, 4 be 1f srl %g1, 24, %g2 srl %g1, 16, %g7 |