diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-06-26 13:51:44 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-06-29 10:06:37 +0100 |
| commit | 198a0a927ab9c52a68297120ee6dd4e36a975b0e (patch) | |
| tree | 741ee77ed2252b9fd780be0b464d97c1b2417ac7 | |
| parent | be020f8618caa0670a2a5b5a5df79549520f7867 (diff) | |
| download | op-kernel-dev-198a0a927ab9c52a68297120ee6dd4e36a975b0e.zip op-kernel-dev-198a0a927ab9c52a68297120ee6dd4e36a975b0e.tar.gz | |
ARM: entry: abort-macro: simplify do_ldrd_abort
We can test bits 27:25 and 20 of the instruction at the same time;
there's no need to separate out the check of bit 20.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| -rw-r--r-- | arch/arm/mm/abort-macro.S | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/arm/mm/abort-macro.S b/arch/arm/mm/abort-macro.S index 8d3b9f9..af97a10 100644 --- a/arch/arm/mm/abort-macro.S +++ b/arch/arm/mm/abort-macro.S @@ -30,12 +30,10 @@ not_thumb: * [20] == 0 */ .macro do_ldrd_abort, tmp, insn - tst \insn, #0x0e000000 @ [27:25] == 0 + tst \insn, #0x0e100000 @ [27:25,20] == 0 bne not_ldrd and \tmp, \insn, #0x000000f0 @ [7:4] == 1101 cmp \tmp, #0x000000d0 - bne not_ldrd - tst \insn, #1 << 20 @ [20] == 0 moveq pc, lr not_ldrd: .endm |
