From 94c8815d754d5aac19772f5973552c6eff322797 Mon Sep 17 00:00:00 2001
From: Nicolas Pitre <nico@cam.org>
Date: Tue, 4 Mar 2008 21:56:21 +0100
Subject: [PATCH] --- yaml --- r: 87276 b: refs/heads/master c:
 b24061fadc2b996fd38baaf01986eac666d0c61b h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/arch/arm/kernel/kprobes.c | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 460239fabd2e..942dc92ea131 100644
--- 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
index a22a98c43ca5..13e371aad879 100644
--- 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,