From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Sun, 10 Feb 2019 11:19:44 +0000 (+0100)
Subject: 3.18-stable patches
X-Git-Tag: v4.9.156~45
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fccd00b5fb05f9ebf22cb7953815b7154548ee6b;p=thirdparty%2Fkernel%2Fstable-queue.git

3.18-stable patches

added patches:
	thermal-hwmon-inline-helpers-when-config_thermal_hwmon-is-not-set.patch
---

diff --git a/queue-3.18/series b/queue-3.18/series
index 6186c73088e..014270ba392 100644
--- a/queue-3.18/series
+++ b/queue-3.18/series
@@ -57,3 +57,4 @@ block-swim3-fix-ebusy-error-when-re-opening-device-a.patch
 kernel-hung_task.c-break-rcu-locks-based-on-jiffies.patch
 fs-epoll-drop-ovflist-branch-prediction.patch
 exec-load_script-don-t-blindly-truncate-shebang-stri.patch
+thermal-hwmon-inline-helpers-when-config_thermal_hwmon-is-not-set.patch
diff --git a/queue-3.18/thermal-hwmon-inline-helpers-when-config_thermal_hwmon-is-not-set.patch b/queue-3.18/thermal-hwmon-inline-helpers-when-config_thermal_hwmon-is-not-set.patch
new file mode 100644
index 00000000000..3a4fc184b4c
--- /dev/null
+++ b/queue-3.18/thermal-hwmon-inline-helpers-when-config_thermal_hwmon-is-not-set.patch
@@ -0,0 +1,43 @@
+From 03334ba8b425b2ad275c8f390cf83c7b081c3095 Mon Sep 17 00:00:00 2001
+From: Eduardo Valentin <edubezval@gmail.com>
+Date: Wed, 2 Jan 2019 00:34:03 +0000
+Subject: thermal: hwmon: inline helpers when CONFIG_THERMAL_HWMON is not set
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+From: Eduardo Valentin <edubezval@gmail.com>
+
+commit 03334ba8b425b2ad275c8f390cf83c7b081c3095 upstream.
+
+Avoid warnings like this:
+thermal_hwmon.h:29:1: warning: ‘thermal_remove_hwmon_sysfs’ defined but not used [-Wunused-function]
+ thermal_remove_hwmon_sysfs(struct thermal_zone_device *tz)
+
+Fixes: 0dd88793aacd ("thermal: hwmon: move hwmon support to single file")
+Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
+Signed-off-by: Eduardo Valentin <edubezval@gmail.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/thermal/thermal_hwmon.h |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/drivers/thermal/thermal_hwmon.h
++++ b/drivers/thermal/thermal_hwmon.h
+@@ -34,13 +34,13 @@
+ int thermal_add_hwmon_sysfs(struct thermal_zone_device *tz);
+ void thermal_remove_hwmon_sysfs(struct thermal_zone_device *tz);
+ #else
+-static int
++static inline int
+ thermal_add_hwmon_sysfs(struct thermal_zone_device *tz)
+ {
+ 	return 0;
+ }
+ 
+-static void
++static inline void
+ thermal_remove_hwmon_sysfs(struct thermal_zone_device *tz)
+ {
+ }