X-Git-Url: http://git.samba.org/samba.git/?a=blobdiff_plain;f=arch%2Fx86%2Fkernel%2Fx8664_ksyms_64.c;fp=arch%2Fx86%2Fkernel%2Fx8664_ksyms_64.c;h=1330dd10295031544d08788320524fb917b889bc;hb=d57c5d51a30152f3175d2344cb6395f08bf8ee0c;hp=6020f6f5927cbc1035b7f86b1f19f1422ded0acf;hpb=781d06248234e221edb560a18461d65808a8a942;p=sfrench%2Fcifs-2.6.git

diff --git a/arch/x86/kernel/x8664_ksyms_64.c b/arch/x86/kernel/x8664_ksyms_64.c
index 6020f6f5927c..1330dd102950 100644
--- a/arch/x86/kernel/x8664_ksyms_64.c
+++ b/arch/x86/kernel/x8664_ksyms_64.c
@@ -13,9 +13,13 @@
 #include <asm/ftrace.h>
 
 #ifdef CONFIG_FUNCTION_TRACER
-/* mcount is defined in assembly */
+/* mcount and __fentry__ are defined in assembly */
+#ifdef CC_USING_FENTRY
+EXPORT_SYMBOL(__fentry__);
+#else
 EXPORT_SYMBOL(mcount);
 #endif
+#endif
 
 EXPORT_SYMBOL(__get_user_1);
 EXPORT_SYMBOL(__get_user_2);