Fix several build and test regressions

4 files changed, 14 insertions, 16 deletions

diff --git a/queue-3.16/clk-s2mps11-fix-matching-when-built-as-module-and-dt-node-contains.patch b/queue-3.16/clk-s2mps11-fix-matching-when-built-as-module-and-dt-node-contains.patch
index c4f970a2..be89f5cf 100644
--- a/queue-3.16/clk-s2mps11-fix-matching-when-built-as-module-and-dt-node-contains.patch
+++ b/queue-3.16/clk-s2mps11-fix-matching-when-built-as-module-and-dt-node-contains.patch
@@ -27,14 +27,12 @@ Fixes: 53c31b3437a6 ("mfd: sec-core: Add of_compatible strings for clock MFD cel
 Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
 Acked-by: Stephen Boyd <sboyd@kernel.org>
 Signed-off-by: Stephen Boyd <sboyd@kernel.org>
+[bwh: Backported to 3.16: drop entry for "samsung,s2mps13-clk"]
 Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
 ---
- drivers/clk/clk-s2mps11.c | 30 ++++++++++++++++++++++++++++++
- 1 file changed, 30 insertions(+)
-
 --- a/drivers/clk/clk-s2mps11.c
 +++ b/drivers/clk/clk-s2mps11.c
-@@ -296,6 +296,36 @@ static const struct platform_device_id s
+@@ -296,6 +296,33 @@ static const struct platform_device_id s
  };
  MODULE_DEVICE_TABLE(platform, s2mps11_clk_id);
  
@@ -53,9 +51,6 @@ Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
 +		.compatible = "samsung,s2mps11-clk",
 +		.data = (void *)S2MPS11X,
 +	}, {
-+		.compatible = "samsung,s2mps13-clk",
-+		.data = (void *)S2MPS13X,
-+	}, {
 +		.compatible = "samsung,s2mps14-clk",
 +		.data = (void *)S2MPS14X,
 +	}, {
diff --git a/queue-3.16/ipv6-fix-another-sparse-warning-on-rt6i_node.patch b/queue-3.16/ipv6-fix-another-sparse-warning-on-rt6i_node.patch
index 651b0e46..31a3bb75 100644
--- a/queue-3.16/ipv6-fix-another-sparse-warning-on-rt6i_node.patch
+++ b/queue-3.16/ipv6-fix-another-sparse-warning-on-rt6i_node.patch
@@ -1,5 +1,5 @@
 From: Ben Hutchings <ben@decadent.org.uk>
-Date: Wed, 02 Jan 2019 18:47:55 +0000
+Date: Fri, 01 Feb 2019 02:10:36 +0000
 Subject: ipv6: Fix another sparse warning on rt6i_node
 
 Commit 0933273ce750 "ipv6: fix sparse warning on rt6i_node" fixed some
@@ -7,19 +7,18 @@ sparse warnings in ip6_fib.c, but introduced a new one in
 fib6_update_sernum() (which was removed before the corresponding
 upstream commit).
 
-fib6_update_sernum() is called with the routing table locked, so use
-rcu_dereference_protected() to read rt6_info::rt6i_node.
+fib6_update_sernum() is called in a RCU read-side section, so use
+rcu_dereference() to read rt6_info::rt6i_node.
 
 Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
 ---
 --- a/net/ipv6/ip6_fib.c
 +++ b/net/ipv6/ip6_fib.c
-@@ -1681,10 +1681,11 @@ static void fib6_prune_clones(struct net
+@@ -1681,10 +1681,10 @@ static void fib6_prune_clones(struct net
  static int fib6_update_sernum(struct rt6_info *rt, void *arg)
  {
  	__u32 sernum = *(__u32 *)arg;
-+	struct fib6_node *fn = rcu_dereference_protected(rt->rt6i_node,
-+				    lockdep_is_held(&rt->rt6i_table->tb6_lock));
++	struct fib6_node *fn = rcu_dereference(rt->rt6i_node);
  
 -	if (rt->rt6i_node &&
 -	    rt->rt6i_node->fn_sernum != sernum)
diff --git a/queue-3.16/mmc-omap-fix-broken-mmc-on-omap15xx-omap5910-omap310.patch b/queue-3.16/mmc-omap-fix-broken-mmc-on-omap15xx-omap5910-omap310.patch
index 0873e68c..4fa22241 100644
--- a/queue-3.16/mmc-omap-fix-broken-mmc-on-omap15xx-omap5910-omap310.patch
+++ b/queue-3.16/mmc-omap-fix-broken-mmc-on-omap15xx-omap5910-omap310.patch
@@ -54,6 +54,8 @@ Tested-by: Ladislav Michl <ladis@linux-mips.org>
 Acked-by: Tony Lindgren <tony@atomide.com>
 Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
 Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
+[bwh: Backported to 3.16: Set initial state to MMC_POWER_OFF instead of
+ MMC_POWER_UNDEFINED]
 Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
 ---
  drivers/mmc/host/omap.c | 11 +++++++++--
@@ -117,7 +119,7 @@ Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
  	slot->host = host;
  	slot->mmc = mmc;
  	slot->id = id;
-+	slot->power_mode = MMC_POWER_UNDEFINED;
++	slot->power_mode = MMC_POWER_OFF;
  	slot->pdata = &host->pdata->slots[id];
  
  	host->slots[id] = slot;
diff --git a/queue-3.16/pm-devfreq-fix-devfreq_add_device-when-drivers-are-built-as.patch b/queue-3.16/pm-devfreq-fix-devfreq_add_device-when-drivers-are-built-as.patch
index 00d913c8..3f2c2f7c 100644
--- a/queue-3.16/pm-devfreq-fix-devfreq_add_device-when-drivers-are-built-as.patch
+++ b/queue-3.16/pm-devfreq-fix-devfreq_add_device-when-drivers-are-built-as.patch
@@ -20,7 +20,9 @@ Fixes: 1b5c1be2c88e (PM / devfreq: map devfreq drivers to governor using name)
 Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>
 Reviewed-by: Chanwoo Choi <cw00.choi@samsung.com>
 Signed-off-by: MyungJoo Ham <myungjoo.ham@samsung.com>
-[bwh: Backported to 3.16: adjust context]
+[bwh: Backported to 3.16:
+ - Use string literal instead of DEVFREQ_GOV_SIMPLE_ONDEMAND
+ - Adjust context]
 Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
 ---
  drivers/devfreq/devfreq.c | 53 ++++++++++++++++++++++++++++++++++++---
@@ -67,7 +69,7 @@ Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
 +	if (IS_ERR(governor)) {
 +		mutex_unlock(&devfreq_list_lock);
 +
-+		if (!strncmp(name, DEVFREQ_GOV_SIMPLE_ONDEMAND,
++		if (!strncmp(name, "simple_ondemand",
 +			     DEVFREQ_NAME_LEN))
 +			err = request_module("governor_%s", "simpleondemand");
 +		else