---

yaml --- r: 87276 b: refs/heads/master c: b24061f h: refs/heads/master v: v3
git-mirror · Mar 6, 2008 · 94c8815 · 94c8815
1 parent 5da9915
commit 94c8815
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 10debfd29c639366f26595606b51abd27ccbb028
+refs/heads/master: b24061fadc2b996fd38baaf01986eac666d0c61b
diff --git a/trunk/arch/arm/kernel/kprobes.c b/trunk/arch/arm/kernel/kprobes.c
@@ -431,6 +431,11 @@ int __kprobes longjmp_break_handler(struct kprobe *p, struct pt_regs *regs)
 	return 0;
 }
 
+int __kprobes arch_trampoline_kprobe(struct kprobe *p)
+{
+	return 0;
+}
+
 static struct undef_hook kprobes_break_hook = {
 	.instr_mask	= 0xffffffff,
 	.instr_val	= KPROBE_BREAKPOINT_INSTRUCTION,