Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2307574a authored by Rabin Vincent's avatar Rabin Vincent Committed by Russell King
Browse files

ARM: 7423/1: kprobes: run t32_simulate_ldr_literal() without insn slot 



t32_simulate_ldr_literal() can be run without an instruction slot, so it
should be using DECODE_SIMULATEX instead of DECODE_EMULATEX.

Acked-by: default avatarJon Medhurst <tixy@yxit.co.uk>
Signed-off-by: default avatarRabin Vincent <rabin.vincent@stericsson.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent b9b52918

arch/arm/kernel/kprobes-thumb.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -660,7 +660,7 @@ static const union decode_item t32_table_1111_100x[] = { 
	/* LDRSB (literal)	1111 1001 x001 1111 xxxx xxxx xxxx xxxx */

	/* LDRSB (literal)	1111 1001 x001 1111 xxxx xxxx xxxx xxxx */

	/* LDRH (literal)	1111 1000 x011 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 */

	/* 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)),

						 REGS(PC, NOSPPCX, 0, 0, 0)),





	/* STRB (immediate)	1111 1000 0000 xxxx xxxx 1xxx xxxx xxxx */

	/* STRB (immediate)	1111 1000 0000 xxxx xxxx 1xxx xxxx xxxx */