git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm
[pandora-kernel.git]
/
arch
/
arm
/
kernel
/
armksyms.c
diff --git
a/arch/arm/kernel/armksyms.c
b/arch/arm/kernel/armksyms.c
index
688b7b1
..
cc7b246
100644
(file)
--- 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