Merge branch 'devel-stable' into devel

[linux-block.git] / arch / arm / include / asm / ftrace.h

diff --git a/arch/arm/include/asm/ftrace.h b/arch/arm/include/asm/ftrace.h
index d74265cffd86d3f2f34d2dbd5ad22439ece1d1a8..103f7ee9731357fa7a8e19bb83416a1465c53cb4 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