From 300d98b2d4774995e21b4e0d90ab46f6a5c08c7d Mon Sep 17 00:00:00 2001 From: Russell King Date: Sun, 26 Jun 2011 13:51:44 +0100 Subject: [PATCH] --- yaml --- r: 258182 b: refs/heads/master c: 198a0a927ab9c52a68297120ee6dd4e36a975b0e h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/mm/abort-macro.S | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 3f4cf53e8436..e74ec0c4eb87 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: be020f8618caa0670a2a5b5a5df79549520f7867 +refs/heads/master: 198a0a927ab9c52a68297120ee6dd4e36a975b0e diff --git a/trunk/arch/arm/mm/abort-macro.S b/trunk/arch/arm/mm/abort-macro.S index 8d3b9f999d1e..af97a10bc5ed 100644 --- a/trunk/arch/arm/mm/abort-macro.S +++ b/trunk/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