From: Russell King Date: Sun, 26 Jun 2011 12:51:44 +0000 (+0100) Subject: ARM: entry: abort-macro: simplify do_ldrd_abort X-Git-Tag: v3.12-rc1~5276^2~1^3~17 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=198a0a927ab9c52a68297120ee6dd4e36a975b0e;p=kernel%2Fkernel-generic.git 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 --- 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