--- /dev/null
+From 6870b673509779195cab300aedc844b352d9cfbc Mon Sep 17 00:00:00 2001
+From: Nathan Chancellor <natechancellor@gmail.com>
+Date: Tue, 18 Sep 2018 22:38:29 -0700
+Subject: PCI: kirin: Fix section mismatch warning
+
+From: Nathan Chancellor <natechancellor@gmail.com>
+
+commit 6870b673509779195cab300aedc844b352d9cfbc upstream.
+
+The PCI kirin driver compilation produces the following section mismatch
+warning:
+
+WARNING: vmlinux.o(.text+0x4758cc): Section mismatch in reference from
+the function kirin_pcie_probe() to the function
+.init.text:kirin_add_pcie_port()
+The function kirin_pcie_probe() references
+the function __init kirin_add_pcie_port().
+This is often because kirin_pcie_probe lacks a __init
+annotation or the annotation of kirin_add_pcie_port is wrong.
+
+Remove '__init' from kirin_add_pcie_port() to fix it.
+
+Fixes: fc5165db245a ("PCI: kirin: Add HiSilicon Kirin SoC PCIe controller driver")
+Reported-by: Nick Desaulniers <ndesaulniers@google.com>
+Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>
+[lorenzo.pieralisi@arm.com: updated commit log]
+Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/pci/dwc/pcie-kirin.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/drivers/pci/dwc/pcie-kirin.c
++++ b/drivers/pci/dwc/pcie-kirin.c
+@@ -449,8 +449,8 @@ static const struct dw_pcie_host_ops kir
+ .host_init = kirin_pcie_host_init,
+ };
+
+-static int __init kirin_add_pcie_port(struct dw_pcie *pci,
+- struct platform_device *pdev)
++static int kirin_add_pcie_port(struct dw_pcie *pci,
++ struct platform_device *pdev)
+ {
+ pci->pp.ops = &kirin_pcie_host_ops;
+