From: Greg Kroah-Hartman Date: Mon, 29 May 2023 15:27:21 +0000 (+0100) Subject: 4.19-stable patches X-Git-Tag: v4.14.316~2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8c40bcbb6ac44f37cc2a87a7a97f2882a202dbbd;p=thirdparty%2Fkernel%2Fstable-queue.git 4.19-stable patches added patches: drivers-depend-on-has_iomem-for-devm_platform_ioremap_resource.patch --- diff --git a/queue-4.19/drivers-depend-on-has_iomem-for-devm_platform_ioremap_resource.patch b/queue-4.19/drivers-depend-on-has_iomem-for-devm_platform_ioremap_resource.patch new file mode 100644 index 00000000000..ad1e2947c76 --- /dev/null +++ b/queue-4.19/drivers-depend-on-has_iomem-for-devm_platform_ioremap_resource.patch @@ -0,0 +1,39 @@ +From 837ccda3480d2861c09aabc5fa014be18df9dd3c Mon Sep 17 00:00:00 2001 +From: Bartosz Golaszewski +Date: Thu, 21 Feb 2019 17:26:27 +0100 +Subject: drivers: depend on HAS_IOMEM for devm_platform_ioremap_resource() + +From: Bartosz Golaszewski + +commit 837ccda3480d2861c09aabc5fa014be18df9dd3c upstream. + +We only build devm_ioremap_resource() if HAS_IOMEM is selected, so this +dependency must cascade down to devm_platform_ioremap_resource(). + +Signed-off-by: Bartosz Golaszewski +Acked-by: Greg Kroah-Hartman +Signed-off-by: Linus Walleij +Cc: Guenter Roeck +Signed-off-by: Greg Kroah-Hartman +--- + drivers/base/platform.c | 2 ++ + 1 file changed, 2 insertions(+) + +--- a/drivers/base/platform.c ++++ b/drivers/base/platform.c +@@ -88,6 +88,7 @@ EXPORT_SYMBOL_GPL(platform_get_resource) + * resource managemend + * @index: resource index + */ ++#ifdef CONFIG_HAS_IOMEM + void __iomem *devm_platform_ioremap_resource(struct platform_device *pdev, + unsigned int index) + { +@@ -97,6 +98,7 @@ void __iomem *devm_platform_ioremap_reso + return devm_ioremap_resource(&pdev->dev, res); + } + EXPORT_SYMBOL_GPL(devm_platform_ioremap_resource); ++#endif /* CONFIG_HAS_IOMEM */ + + /** + * platform_get_irq - get an IRQ for a device diff --git a/queue-4.19/series b/queue-4.19/series index 83206854182..8dc2ac87675 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -130,3 +130,4 @@ x86-show_trace_log_lvl-ensure-stack-pointer-is-aligned-again.patch asoc-intel-skylake-fix-declaration-of-enum-skl_ch_cfg.patch forcedeth-fix-an-error-handling-path-in-nv_probe.patch 3c589_cs-fix-an-error-handling-path-in-tc589_probe.patch +drivers-depend-on-has_iomem-for-devm_platform_ioremap_resource.patch