From: Greg Kroah-Hartman Date: Tue, 20 Aug 2019 23:11:19 +0000 (-0700) Subject: 4.14-stable patches X-Git-Tag: v4.19.68~14 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=46466948ed344e8e266241bf6f0f1c323ef9dc38;p=thirdparty%2Fkernel%2Fstable-queue.git 4.14-stable patches added patches: iommu-amd-move-iommu_init_pci-to-.init-section.patch --- diff --git a/queue-4.14/iommu-amd-move-iommu_init_pci-to-.init-section.patch b/queue-4.14/iommu-amd-move-iommu_init_pci-to-.init-section.patch new file mode 100644 index 00000000000..4a24c0467bc --- /dev/null +++ b/queue-4.14/iommu-amd-move-iommu_init_pci-to-.init-section.patch @@ -0,0 +1,30 @@ +From 24d2c521749d8547765b555b7a85cca179bb2275 Mon Sep 17 00:00:00 2001 +From: Joerg Roedel +Date: Fri, 5 Oct 2018 12:32:46 +0200 +Subject: iommu/amd: Move iommu_init_pci() to .init section + +From: Joerg Roedel + +commit 24d2c521749d8547765b555b7a85cca179bb2275 upstream. + +The function is only called from another __init function, so +it should be moved to .init too. + +Signed-off-by: Joerg Roedel +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/iommu/amd_iommu_init.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/iommu/amd_iommu_init.c ++++ b/drivers/iommu/amd_iommu_init.c +@@ -1692,7 +1692,7 @@ static const struct attribute_group *amd + NULL, + }; + +-static int iommu_init_pci(struct amd_iommu *iommu) ++static int __init iommu_init_pci(struct amd_iommu *iommu) + { + int cap_ptr = iommu->cap_ptr; + u32 range, misc, low, high; diff --git a/queue-4.14/series b/queue-4.14/series index 4197b21cd89..f1d5b22120a 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -58,3 +58,4 @@ arm64-compat-allow-single-byte-watchpoints-on-all-addresses.patch arm64-ftrace-ensure-module-ftrace-trampoline-is-coherent-with-i-side.patch netfilter-conntrack-use-consistent-ct-id-hash-calculation.patch input-psmouse-fix-build-error-of-multiple-definition.patch +iommu-amd-move-iommu_init_pci-to-.init-section.patch