diff options
| author | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-02-21 23:16:08 -0500 |
|---|---|---|
| committer | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-02-21 23:16:08 -0500 |
| commit | fbf6b5852c5f253c1d7ac555fc3ac5827a87c1be (patch) | |
| tree | 700342a037efcc77ca7ac32cba6b1937070e6e88 /arch/arm/kernel/kprobes-decode.c | |
| parent | 89e446a5f7cd4cb92a67630ea880203b3ec0b7da (diff) | |
| parent | 5a5af730536fbf15fc354980cba2a0400afa6b76 (diff) | |
Merge remote-tracking branch 'rmk/fixes' into linaro-2.6.38linaro-linux-2.6.38-upstream-22Feb2011
Diffstat (limited to 'arch/arm/kernel/kprobes-decode.c')
| -rw-r--r-- | arch/arm/kernel/kprobes-decode.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/kernel/kprobes-decode.c b/arch/arm/kernel/kprobes-decode.c index 2c1f0050c9c..8f6ed43861f 100644 --- a/arch/arm/kernel/kprobes-decode.c +++ b/arch/arm/kernel/kprobes-decode.c @@ -1437,7 +1437,7 @@ arm_kprobe_decode_insn(kprobe_opcode_t insn, struct arch_specific_insn *asi) return space_cccc_1100_010x(insn, asi); - } else if ((insn & 0x0e000000) == 0x0c400000) { + } else if ((insn & 0x0e000000) == 0x0c000000) { return space_cccc_110x(insn, asi); |