From 8b67241a9f9aa5c05b4d7788cff33279bf9bd02e Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Fri, 22 Jan 2010 07:35:20 -0500 Subject: [PATCH] --- yaml --- r: 188493 b: refs/heads/master c: aebfef03249819886a7f9c981940cbd48d82ea47 h: refs/heads/master i: 188491: 6c87a3eb673421365db25f414e5ad7e958368c22 v: v3 --- [refs] | 2 +- trunk/arch/blackfin/Kconfig | 1 + trunk/arch/blackfin/kernel/ftrace-entry.S | 11 ++++++++++- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 36d8c021756f..61516bf0aead 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6388d14eb2dd3af655cee28ca2a1c56881e63e56 +refs/heads/master: aebfef03249819886a7f9c981940cbd48d82ea47 diff --git a/trunk/arch/blackfin/Kconfig b/trunk/arch/blackfin/Kconfig index f46db59eac8a..3123aa49ff79 100644 --- a/trunk/arch/blackfin/Kconfig +++ b/trunk/arch/blackfin/Kconfig @@ -25,6 +25,7 @@ config BLACKFIN 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 diff --git a/trunk/arch/blackfin/kernel/ftrace-entry.S b/trunk/arch/blackfin/kernel/ftrace-entry.S index 76dd4fbcd17a..db3a51b0af21 100644 --- a/trunk/arch/blackfin/kernel/ftrace-entry.S +++ b/trunk/arch/blackfin/kernel/ftrace-entry.S @@ -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; + if ! cc jump _ftrace_stub (bp); +#endif + /* save third function arg early so we can do testing below */ [--sp] = r2;