git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'devel-stable' into devel
[safe/jmp/linux-2.6]
/
arch
/
arm
/
include
/
asm
/
ftrace.h
diff --git
a/arch/arm/include/asm/ftrace.h
b/arch/arm/include/asm/ftrace.h
index
d74265c
..
103f7ee
100644
(file)
--- a/
arch/arm/include/asm/ftrace.h
+++ b/
arch/arm/include/asm/ftrace.h
@@
-7,6
+7,7
@@
#ifndef __ASSEMBLY__
extern void mcount(void);
+extern void __gnu_mcount_nc(void);
#endif
#endif