Home Home > GIT Browse > SLE15-SP1-AZURE
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPetr Tesarik <ptesarik@suse.cz>2019-06-21 21:55:31 +0200
committerPetr Tesarik <ptesarik@suse.cz>2019-06-21 21:55:31 +0200
commit52b668b6e852151fea4e101da852c107e00fad4d (patch)
treeeff8487c6fa4554809818ef034c28c90c782b684
parent5e145baf5986430ed0e889f24fcfcbd940f9c381 (diff)
- drivers: depend on HAS_IOMEM for
devm_platform_ioremap_resource() (bsc#1136333 jsc#SLE-4994). - Refresh patches.drivers/drivers-fix-a-typo-in-the-kernel-doc-for-devm_platfo.patch.
-rw-r--r--patches.drivers/drivers-depend-on-has_iomem-for-devm_platform_ioremap_resource36
-rw-r--r--patches.drivers/drivers-fix-a-typo-in-the-kernel-doc-for-devm_platfo.patch2
-rw-r--r--series.conf1
3 files changed, 38 insertions, 1 deletions
diff --git a/patches.drivers/drivers-depend-on-has_iomem-for-devm_platform_ioremap_resource b/patches.drivers/drivers-depend-on-has_iomem-for-devm_platform_ioremap_resource
new file mode 100644
index 0000000000..e17aca8572
--- /dev/null
+++ b/patches.drivers/drivers-depend-on-has_iomem-for-devm_platform_ioremap_resource
@@ -0,0 +1,36 @@
+From: Bartosz Golaszewski <bgolaszewski@baylibre.com>
+Date: Thu, 21 Feb 2019 17:26:27 +0100
+Subject: drivers: depend on HAS_IOMEM for devm_platform_ioremap_resource()
+Git-commit: 837ccda3480d2861c09aabc5fa014be18df9dd3c
+Patch-mainline: v5.1-rc1
+References: bsc#1136333 jsc#SLE-4994
+
+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 <bgolaszewski@baylibre.com>
+Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
+Acked-by: Petr Tesarik <ptesarik@suse.com>
+---
+ drivers/base/platform.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/drivers/base/platform.c
++++ b/drivers/base/platform.c
+@@ -87,6 +87,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)
+ {
+@@ -96,6 +97,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/patches.drivers/drivers-fix-a-typo-in-the-kernel-doc-for-devm_platfo.patch b/patches.drivers/drivers-fix-a-typo-in-the-kernel-doc-for-devm_platfo.patch
index 10644b7f70..e21b00dcd8 100644
--- a/patches.drivers/drivers-fix-a-typo-in-the-kernel-doc-for-devm_platfo.patch
+++ b/patches.drivers/drivers-fix-a-typo-in-the-kernel-doc-for-devm_platfo.patch
@@ -28,4 +28,4 @@ Acked-by: Thomas Bogendoerfer <tbogendoerfer@suse.de>
+ * resource management
* @index: resource index
*/
- void __iomem *devm_platform_ioremap_resource(struct platform_device *pdev,
+ #ifdef CONFIG_HAS_IOMEM
diff --git a/series.conf b/series.conf
index 62b4f9a5b9..cd3c29d23d 100644
--- a/series.conf
+++ b/series.conf
@@ -45550,6 +45550,7 @@
patches.drivers/rtc-pm8xxx-fix-unintended-sign-extension.patch
patches.fixes/0001-backlight-pwm_bl-Use-gpiod_get_value_cansleep-to-get.patch
patches.drivers/drivers-provide-devm_platform_ioremap_resource.patch
+ patches.drivers/drivers-depend-on-has_iomem-for-devm_platform_ioremap_resource
patches.drivers/gpio-gpio-omap-fix-level-interrupt-idling.patch
patches.drivers/cdrom-Fix-race-condition-in-cdrom_sysctl_register.patch
patches.suse/0275-bcache-never-writeback-a-discard-operation.patch