From: Nicolas Pitre <nico@cam.org>
Date: Tue, 4 Mar 2008 20:56:21 +0000 (+0100)
Subject: [ARM] 4847/1: kprobes: fix compilation with CONFIG_DEBUG_FS=y
X-Git-Tag: v2.6.25-rc6~29^2~10
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b24061fadc2b996fd38baaf01986eac666d0c61b;p=linux-2.6

[ARM] 4847/1: kprobes: fix compilation with CONFIG_DEBUG_FS=y

Signed-off-by: Nicolas Pitre <nico@marvell.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
---

diff --git a/arch/arm/kernel/kprobes.c b/arch/arm/kernel/kprobes.c
index a22a98c43c..13e371aad8 100644
--- a/arch/arm/kernel/kprobes.c
+++ b/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,