From 80162f8248bc995b1e6accccbc017ba73d1ab2b7 Mon Sep 17 00:00:00 2001 From: Steven Rostedt Date: Mon, 12 May 2008 21:20:50 +0200 Subject: [PATCH] --- yaml --- r: 100472 b: refs/heads/master c: caf8cdebfb6c1cff50ea8077f1a07c2333d6d1fd h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/kernel/trace/ftrace.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 672db97e7d9a..c593836bc559 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9ff9cdb2d3b0971f89e899b3420aadd91bddc215 +refs/heads/master: caf8cdebfb6c1cff50ea8077f1a07c2333d6d1fd diff --git a/trunk/kernel/trace/ftrace.c b/trunk/kernel/trace/ftrace.c index 425b1fec3d83..57350cbd1f61 100644 --- a/trunk/kernel/trace/ftrace.c +++ b/trunk/kernel/trace/ftrace.c @@ -326,8 +326,8 @@ ftrace_record_ip(unsigned long ip) preempt_enable_notrace(); } -#define FTRACE_ADDR ((long)(&ftrace_caller)) -#define MCOUNT_ADDR ((long)(&mcount)) +#define FTRACE_ADDR ((long)(ftrace_caller)) +#define MCOUNT_ADDR ((long)(mcount)) static void notrace __ftrace_replace_code(struct dyn_ftrace *rec,