From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Thu, 19 Sep 2019 18:22:45 +0000 (+0200)
Subject: 4.19-stable patches
X-Git-Tag: v4.4.194~20
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bde84a783dd8db4e053e5321368615465c456a33;p=thirdparty%2Fkernel%2Fstable-queue.git

4.19-stable patches

added patches:
	pci-kirin-fix-section-mismatch-warning.patch
---

diff --git a/queue-4.19/pci-kirin-fix-section-mismatch-warning.patch b/queue-4.19/pci-kirin-fix-section-mismatch-warning.patch
new file mode 100644
index 00000000000..ce8bf737eee
--- /dev/null
+++ b/queue-4.19/pci-kirin-fix-section-mismatch-warning.patch
@@ -0,0 +1,46 @@
+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/controller/dwc/pcie-kirin.c |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/drivers/pci/controller/dwc/pcie-kirin.c
++++ b/drivers/pci/controller/dwc/pcie-kirin.c
+@@ -467,8 +467,8 @@ static int kirin_pcie_add_msi(struct dw_
+ 	return 0;
+ }
+ 
+-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)
+ {
+ 	int ret;
+ 
diff --git a/queue-4.19/series b/queue-4.19/series
index c25927a303a..13f92163f3a 100644
--- a/queue-4.19/series
+++ b/queue-4.19/series
@@ -71,3 +71,4 @@ x86-hyper-v-fix-overflow-bug-in-fill_gva_list.patch
 keys-fix-missing-null-pointer-check-in-request_key_a.patch
 iommu-amd-flush-old-domains-in-kdump-kernel.patch
 iommu-amd-fix-race-in-increase_address_space.patch
+pci-kirin-fix-section-mismatch-warning.patch