On Fri, 2010-01-22 at 07:57 -0500, [email protected] wrote: > Revision > 8221 > Author > vapier > Date > 2010-01-22 07:56:58 -0500 (Fri, 22 Jan 2010) > Log Message > Blackfin: implement ftrace mcount test > Modified Paths > * trunk/arch/blackfin/Kconfig > * trunk/arch/blackfin/kernel/ftrace-entry.S > Diff > Modified: trunk/arch/blackfin/Kconfig (8220 => 8221) > > --- trunk/arch/blackfin/Kconfig 2010-01-22 10:07:30 UTC (rev 8220) > +++ trunk/arch/blackfin/Kconfig 2010-01-22 12:56:58 UTC (rev 8221) > @@ -21,6 +21,7 @@ > def_bool y > select HAVE_FUNCTION_GRAPH_TRACER > select HAVE_FUNCTION_TRACER > + select HAVE_FUNCTION_TRACE_MCOUNT_TEST > select HAVE_IDE > select HAVE_KERNEL_GZIP if RAMKERNEL > select HAVE_KERNEL_BZIP2 if RAMKERNEL > Modified: trunk/arch/blackfin/kernel/ftrace-entry.S (8220 => 8221) > > --- trunk/arch/blackfin/kernel/ftrace-entry.S 2010-01-22 10:07:30 UTC (rev > 8220) > +++ trunk/arch/blackfin/kernel/ftrace-entry.S 2010-01-22 12:56:58 UTC (rev > 8221) > @@ -1,7 +1,7 @@ > /* > * mcount and friends -- ftrace stuff > * > - * Copyright (C) 2009 Analog Devices Inc. > + * Copyright (C) 2009-2010 Analog Devices Inc. > * Licensed under the GPL-2 or later. > */ > > @@ -21,6 +21,15 @@ > * function will be waiting there. mmmm pie. > */ > ENTRY(__mcount) > +#ifdef CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST > + /* optional micro optimization: return if stopped */ > + p1.l = _function_trace_stop; > + p1.h = _function_trace_stop; > + r3 = [p1]; > + cc = r3 == 0;
Should it be "cc = r3 == 1;" ? > + if cc jump _ftrace_stub (bp); > +#endif > + > /* save third function arg early so we can do testing below */ > [--sp] = r2; > -Yi _______________________________________________ Linux-kernel-commits mailing list [email protected] https://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits
