diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-07-10 13:43:00 +0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-07-10 13:43:00 +0400 |
commit | bac0c9103b31c3dd83ad9d731dd9834e2ba75e4f (patch) | |
tree | 702dd6a7ce06d224d594c2293af546b11ac9f51b /arch/arm/kernel/armksyms.c | |
parent | 6329d3021bcfa9038621e6e917d98929421d8ec8 (diff) | |
parent | 98a05ed4bd7774f533ab185fe0bf2fdc58292d7c (diff) | |
download | linux-bac0c9103b31c3dd83ad9d731dd9834e2ba75e4f.tar.xz |
Merge branch 'tracing/ftrace' into auto-ftrace-next
Diffstat (limited to 'arch/arm/kernel/armksyms.c')
-rw-r--r-- | arch/arm/kernel/armksyms.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/kernel/armksyms.c b/arch/arm/kernel/armksyms.c index 688b7b1ee416..cc7b246e9652 100644 --- a/arch/arm/kernel/armksyms.c +++ b/arch/arm/kernel/armksyms.c @@ -18,6 +18,7 @@ #include <asm/io.h> #include <asm/system.h> #include <asm/uaccess.h> +#include <asm/ftrace.h> /* * libgcc functions - functions that are used internally by the @@ -181,3 +182,7 @@ EXPORT_SYMBOL(_find_next_bit_be); #endif EXPORT_SYMBOL(copy_page); + +#ifdef CONFIG_FTRACE +EXPORT_SYMBOL(mcount); +#endif |