From: Jonathan Marek <jonathan@marek.ca>
Date: Thu, 22 Nov 2018 02:32:25 +0000 (-0500)
Subject: firmware: qcom: scm: fix compilation error when disabled
X-Git-Tag: android-x86-9.0-r1~4^2~24^2~75
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=b6f4e1caf426b1978c1afdbade18d094aed4e3ce;p=android-x86%2Fkernel.git

firmware: qcom: scm: fix compilation error when disabled

[ Upstream commit 16ad9501b1f2edebe24f8cf3c09da0695871986b ]

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

Signed-off-by: Jonathan Marek <jonathan@marek.ca>
Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Signed-off-by: Andy Gross <andy.gross@linaro.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---

diff --git a/include/linux/qcom_scm.h b/include/linux/qcom_scm.h
index 5d65521260b3..116b81ac442a 100644
--- a/include/linux/qcom_scm.h
+++ b/include/linux/qcom_scm.h
@@ -65,6 +65,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)
 {