Merge remote-tracking branch 'origin/v4.4/topic/kprobes64' into linux-linaro-lsk...

[firefly-linux-kernel-4.4.55.git] / arch / arm64 / kernel / arm64ksyms.c

diff --git a/arch/arm64/kernel/arm64ksyms.c b/arch/arm64/kernel/arm64ksyms.c
index c654df05b7d71c38e4580fc80b4e338ce1a0599c..803965a792e0ea132d9ad4c7693adf25cc9bafe8 100644 (file)
--- a/arch/arm64/kernel/arm64ksyms.c
+++ b/arch/arm64/kernel/arm64ksyms.c
@@ -26,6 +26,7 @@
 #include <linux/syscalls.h>
 #include <linux/uaccess.h>
 #include <linux/io.h>
+#include <linux/kprobes.h>
 
 #include <asm/checksum.h>
 
@@ -67,4 +68,5 @@ EXPORT_SYMBOL(test_and_change_bit);
 
 #ifdef CONFIG_FUNCTION_TRACER
 EXPORT_SYMBOL(_mcount);
+NOKPROBE_SYMBOL(_mcount);
 #endif