From: Andreev S.V <s.andreev@samsung.com>
Date: Wed, 16 May 2012 11:08:46 +0000 (+0400)
Subject: Unification
X-Git-Tag: Tizen_SDK_2.3~801^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8a83d14798d71933120d0debf39b0a77f8cda1e9;p=kernel%2Fswap-modules.git

Unification
---

diff --git a/kprobe/arch/asm-arm/dbi_kprobes.c b/kprobe/arch/asm-arm/dbi_kprobes.c
index 63f15ca..6f65e90 100644
--- a/kprobe/arch/asm-arm/dbi_kprobes.c
+++ b/kprobe/arch/asm-arm/dbi_kprobes.c
@@ -855,7 +855,7 @@ int arch_copy_trampoline_arm_uprobe (struct kprobe *p, struct task_struct *task,
 					memcpy (insns, gen_insn_execbuf, sizeof (insns));
 					insns[UPROBES_TRAMP_INSN_IDX] = insn[0];
 				}
-				insns[UPROBES_TRAMP_RET_BREAK_IDX] = UNDEF_INSTRUCTION;
+				insns[UPROBES_TRAMP_RET_BREAK_IDX] = BREAKPOINT_INSTRUCTION;
 				insns[7] = (kprobe_opcode_t) (p->addr + 1);
 				DBPRINTF ("arch_prepare_uprobe: to %p - %lx %lx %lx %lx %lx %lx %lx %lx %lx",
 						p->ainsn.insn_arm, insns[0], insns[1], insns[2], insns[3], insns[4],