Hi all,
Today's linux-next build (powerpc allyesconfig) failed like this:
kernel/trace/ftrace.c:317: error: redefinition of 'ftrace_release'
include/linux/ftrace.h:207: error: previous definition of 'ftrace_release' was here
Introduced by commit 61e679bf257baf9a089641999cf618e92f07b5dd ("ftrace:
remove old pointers to mcount").
I applied the following patch.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Mon, 25 Aug 2008 20:28:31 +1000
Subject: [PATCH] ftrace: protect the definition of ftrace_release
Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
---
kernel/trace/ftrace.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
index 2bc3eb5..094170a 100644
--- a/kernel/trace/ftrace.c
+++ b/kernel/trace/ftrace.c
@@ -314,6 +314,7 @@ static void ftrace_free_rec(struct dyn_ftrace *rec)
rec->flags |= FTRACE_FL_FREE;
}
+#ifdef CONFIG_FTRACE_MCOUNT_RECORD
void ftrace_release(void *start, unsigned long size)
{
struct dyn_ftrace *rec;
@@ -339,6 +340,7 @@ void ftrace_release(void *start, unsigned long size)
spin_unlock(&ftrace_lock);
}
+#endif /* CONFIG_FTRACE_MCOUNT_RECORD */
static struct dyn_ftrace *ftrace_alloc_dyn_node(unsigned long ip)
{
--
1.5.6.3
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
