[PATCH] ARM: kprobes: run t32_simulate_ldr_literal() without insn slot

Tixy tixy at yxit.co.uk
Tue Jun 12 03:08:26 EDT 2012


On Mon, 2012-06-11 at 13:48 +0530, Rabin Vincent wrote:
> t32_simulate_ldr_literal() can be run without an instruction slot, so it
> should be using DECODE_SIMULATEX instead of DECODE_EMULATEX.
> 
> Signed-off-by: Rabin Vincent <rabin.vincent at stericsson.com>

Acked-by: Jon Medhurst <tixy at yxit.co.uk>

> ---
>  arch/arm/kernel/kprobes-thumb.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/arch/arm/kernel/kprobes-thumb.c b/arch/arm/kernel/kprobes-thumb.c
> index 8f96ec7..6123daf 100644
> --- a/arch/arm/kernel/kprobes-thumb.c
> +++ b/arch/arm/kernel/kprobes-thumb.c
> @@ -660,7 +660,7 @@ static const union decode_item t32_table_1111_100x[] = {
>  	/* LDRSB (literal)	1111 1001 x001 1111 xxxx xxxx xxxx xxxx */
>  	/* LDRH (literal)	1111 1000 x011 1111 xxxx xxxx xxxx xxxx */
>  	/* LDRSH (literal)	1111 1001 x011 1111 xxxx xxxx xxxx xxxx */
> -	DECODE_EMULATEX	(0xfe5f0000, 0xf81f0000, t32_simulate_ldr_literal,
> +	DECODE_SIMULATEX(0xfe5f0000, 0xf81f0000, t32_simulate_ldr_literal,
>  						 REGS(PC, NOSPPCX, 0, 0, 0)),
>  
>  	/* STRB (immediate)	1111 1000 0000 xxxx xxxx 1xxx xxxx xxxx */






More information about the linux-arm-kernel mailing list