Merge branch 'devel-stable' into for-next (98f07013) · Commits · e / devices / android_kernel_fairphone_FP4

arch/arm/kernel/kprobes-common.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -13,6 +13,7 @@

		#include <linux/kernel.h>
		#include <linux/kprobes.h>
		#include <asm/opcodes.h>

		#include "kprobes.h"

		@@ -153,7 +154,8 @@ kprobe_decode_ldmstm(probes_opcode_t insn, struct arch_probes_insn *asi,

		if (handler) {
		/* We can emulate the instruction in (possibly) modified form */
		asi->insn[0] = (insn & 0xfff00000) \| (rn << 16) \| reglist;
		asi->insn[0] = __opcode_to_mem_arm((insn & 0xfff00000) \|
		(rn << 16) \| reglist);
		asi->insn_handler = handler;
		return INSN_GOOD;
		}