Skip to contentSkip to conversation

firmware: qcom: scm: fix compilation error when disabled

PATCH In review Jonathan Marek 3 participants 3 messages Nov 22, 2018 – Dec 5, 2018 Arm Qualcomm mailing list

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 firmware: qcom: scm: fix compilation error when disabled

This fixes the case when CONFIG_QCOM_SCM is not enabled, and linux/errno.h has not been included previously.

---
drm/msm includes qcom_scm.h, but can be used with non-qcom hw (IMX5)

 include/linux/qcom_scm.h | 3 +++
 1 file changed, 3 insertions(+)
include/linux/qcom_scm.h +3 -0
index 06996ad4f2bc..1637385bcc17 100644
@@ -67,6 +67,9 @@ extern int qcom_scm_iommu_secure_ptbl_init(u64 addr, u32 size, u32 spare);
 extern int qcom_scm_io_readl(phys_addr_t addr, unsigned int *val);
 extern int qcom_scm_io_writel(phys_addr_t addr, unsigned int val);
 #else
+
+#include <linux/errno.h>
+
 static inline
 int qcom_scm_set_cold_boot_addr(void *entry, const cpumask_t *cpus)
 {
Signature · 1 line
2.17.1
Reviewed-by on v1 1/1
#1 lore raw

+ linux-arm-msm

Quoted 4 lines · Jonathan Marek

This fixes the case when CONFIG_QCOM_SCM is not enabled, and linux/errno.h has not been included previously.

Regards,
Bjorn

Quoted 23 lines

---
drm/msm includes qcom_scm.h, but can be used with non-qcom hw (IMX5)

 include/linux/qcom_scm.h | 3 +++
 1 file changed, 3 insertions(+)
include/linux/qcom_scm.h +3 -0
index 06996ad4f2bc..1637385bcc17 100644
@@ -67,6 +67,9 @@ extern int qcom_scm_iommu_secure_ptbl_init(u64 addr, u32 size, u32 spare);
 extern int qcom_scm_io_readl(phys_addr_t addr, unsigned int *val);
 extern int qcom_scm_io_writel(phys_addr_t addr, unsigned int val);
 #else
+
+#include <linux/errno.h>
+
 static inline
 int qcom_scm_set_cold_boot_addr(void *entry, const cpumask_t *cpus)
 {
Signature · 1 line
2.17.1