summaryrefslogtreecommitdiff
path: root/arch/arm/kernel/armksyms.c
diff options
context:
space:
mode:
authorLinaro CI <ci_notify@linaro.org>2017-10-31 09:58:44 +0000
committerLinaro CI <ci_notify@linaro.org>2017-10-31 09:58:44 +0000
commit583520e724f268ba033cbc1ff21115822402e7b5 (patch)
treed35d616e6f85c4ca59916665112a3e20bb5a117b /arch/arm/kernel/armksyms.c
parent32458fcb7bd6ac2aa886713b7c2e128c9e80a730 (diff)
parentc9653f0531d8d32836aa4c8d75ce10a82a4d7492 (diff)
Merge remote-tracking branch 'sumit-lts/lts-4.4.y-hikey' into linux-4.4.y4.4.96-rc1-hikey-20171031
Diffstat (limited to 'arch/arm/kernel/armksyms.c')
-rw-r--r--arch/arm/kernel/armksyms.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/kernel/armksyms.c b/arch/arm/kernel/armksyms.c
index f89811fb9a55..7e45f69a0ddc 100644
--- a/arch/arm/kernel/armksyms.c
+++ b/arch/arm/kernel/armksyms.c
@@ -16,6 +16,7 @@
#include <linux/syscalls.h>
#include <linux/uaccess.h>
#include <linux/io.h>
+#include <linux/arm-smccc.h>
#include <asm/checksum.h>
#include <asm/ftrace.h>
@@ -175,3 +176,8 @@ EXPORT_SYMBOL(__gnu_mcount_nc);
EXPORT_SYMBOL(__pv_phys_pfn_offset);
EXPORT_SYMBOL(__pv_offset);
#endif
+
+#ifdef CONFIG_HAVE_ARM_SMCCC
+EXPORT_SYMBOL(arm_smccc_smc);
+EXPORT_SYMBOL(arm_smccc_hvc);
+#endif