Add build and warning fixes

12 files changed, 533 insertions, 0 deletions

diff --git a/queue-3.16/arm64-use-linux-types.h-in-kvm.h.patch b/queue-3.16/arm64-use-linux-types.h-in-kvm.h.patch
new file mode 100644
index 00000000..9358885f
--- /dev/null
+++ b/queue-3.16/arm64-use-linux-types.h-in-kvm.h.patch
@@ -0,0 +1,31 @@
+From: Arnd Bergmann <arnd@arndb.de>
+Date: Thu, 12 Nov 2015 15:41:08 +0100
+Subject: arm64: use linux/types.h in kvm.h
+
+commit d19279154b3fff9adff96b54d1a77dfb8f01e3da upstream.
+
+We should always use linux/types.h instead of asm/types.h for
+consistency, and Kbuild actually warns about it:
+
+./usr/include/asm/kvm.h:35: include of <linux/types.h> is preferred over <asm/types.h>
+
+This patch does as Kbuild asks us.
+
+Signed-off-by: Arnd Bergmann <arnd@arndb.de>
+Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
+Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
+---
+ arch/arm64/include/uapi/asm/kvm.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/arch/arm64/include/uapi/asm/kvm.h
++++ b/arch/arm64/include/uapi/asm/kvm.h
+@@ -32,7 +32,7 @@
+ 
+ #ifndef __ASSEMBLY__
+ #include <linux/psci.h>
+-#include <asm/types.h>
++#include <linux/types.h>
+ #include <asm/ptrace.h>
+ 
+ #define __KVM_HAVE_GUEST_DEBUG
diff --git a/queue-3.16/clk-si5351-constify-clock-names-and-struct-regmap_config.patch b/queue-3.16/clk-si5351-constify-clock-names-and-struct-regmap_config.patch
new file mode 100644
index 00000000..ab15367f
--- /dev/null
+++ b/queue-3.16/clk-si5351-constify-clock-names-and-struct-regmap_config.patch
@@ -0,0 +1,57 @@
+From: Krzysztof Kozlowski <k.kozlowski@samsung.com>
+Date: Fri, 20 Mar 2015 12:34:10 +0100
+Subject: clk: si5351: Constify clock names and struct regmap_config
+
+commit 8234caed27f7bce141c9fb1f7e76c91a2a66d248 upstream.
+
+The regmap_config struct may be const because it is not modified by the
+driver and regmap_init() accepts pointer to const.
+
+Replace doubled const in the arrays of clock names with proper const
+pointer to const data. This fixes the warnings:
+
+drivers/clk/clk-si5351.c:71:25: warning: duplicate const
+drivers/clk/clk-si5351.c:74:25: warning: duplicate const
+drivers/clk/clk-si5351.c:77:25: warning: duplicate const
+drivers/clk/clk-si5351.c:80:25: warning: duplicate const
+
+Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
+Reviewed-by: Max Filippov <jcmvbkbc@gmail.com>
+Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
+Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
+---
+ drivers/clk/clk-si5351.c | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+--- a/drivers/clk/clk-si5351.c
++++ b/drivers/clk/clk-si5351.c
+@@ -68,16 +68,16 @@ struct si5351_driver_data {
+ 	struct si5351_hw_data	*clkout;
+ };
+ 
+-static const char const *si5351_input_names[] = {
++static const char * const si5351_input_names[] = {
+ 	"xtal", "clkin"
+ };
+-static const char const *si5351_pll_names[] = {
++static const char * const si5351_pll_names[] = {
+ 	"plla", "pllb", "vxco"
+ };
+-static const char const *si5351_msynth_names[] = {
++static const char * const si5351_msynth_names[] = {
+ 	"ms0", "ms1", "ms2", "ms3", "ms4", "ms5", "ms6", "ms7"
+ };
+-static const char const *si5351_clkout_names[] = {
++static const char * const si5351_clkout_names[] = {
+ 	"clk0", "clk1", "clk2", "clk3", "clk4", "clk5", "clk6", "clk7"
+ };
+ 
+@@ -207,7 +207,7 @@ static bool si5351_regmap_is_writeable(s
+ 	return true;
+ }
+ 
+-static struct regmap_config si5351_regmap_config = {
++static const struct regmap_config si5351_regmap_config = {
+ 	.reg_bits = 8,
+ 	.val_bits = 8,
+ 	.cache_type = REGCACHE_RBTREE,
diff --git a/queue-3.16/ir-core-fix-gcc-7-warning-on-bool-arithmetic.patch b/queue-3.16/ir-core-fix-gcc-7-warning-on-bool-arithmetic.patch
new file mode 100644
index 00000000..2e6847a6
--- /dev/null
+++ b/queue-3.16/ir-core-fix-gcc-7-warning-on-bool-arithmetic.patch
@@ -0,0 +1,37 @@
+From: Arnd Bergmann <arnd@arndb.de>
+Date: Thu, 11 May 2017 08:46:44 -0300
+Subject: [media] ir-core: fix gcc-7 warning on bool arithmetic
+
+commit bd7e31bbade02bc1e92aa00d5cf2cee2da66838a upstream.
+
+gcc-7 suggests that an expression using a bitwise not and a bitmask
+on a 'bool' variable is better written using boolean logic:
+
+drivers/media/rc/imon.c: In function 'imon_incoming_scancode':
+drivers/media/rc/imon.c:1725:22: error: '~' on a boolean expression [-Werror=bool-operation]
+    ictx->pad_mouse = ~(ictx->pad_mouse) & 0x1;
+                      ^
+drivers/media/rc/imon.c:1725:22: note: did you mean to use logical not?
+
+I agree.
+
+Fixes: 21677cfc562a ("V4L/DVB: ir-core: add imon driver")
+
+Signed-off-by: Arnd Bergmann <arnd@arndb.de>
+Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
+Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
+---
+ drivers/media/rc/imon.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/media/rc/imon.c
++++ b/drivers/media/rc/imon.c
+@@ -1530,7 +1530,7 @@ static void imon_incoming_packet(struct
+ 	if (kc == KEY_KEYBOARD && !ictx->release_code) {
+ 		ictx->last_keycode = kc;
+ 		if (!nomouse) {
+-			ictx->pad_mouse = ~(ictx->pad_mouse) & 0x1;
++			ictx->pad_mouse = !ictx->pad_mouse;
+ 			dev_dbg(dev, "toggling to %s mode\n",
+ 				ictx->pad_mouse ? "mouse" : "keyboard");
+ 			spin_unlock_irqrestore(&ictx->kc_lock, flags);
diff --git a/queue-3.16/kexec-fix-make-headers_check.patch b/queue-3.16/kexec-fix-make-headers_check.patch
new file mode 100644
index 00000000..0460d3b1
--- /dev/null
+++ b/queue-3.16/kexec-fix-make-headers_check.patch
@@ -0,0 +1,55 @@
+From: Geoff Levand <geoff@infradead.org>
+Date: Tue, 17 Feb 2015 13:45:50 -0800
+Subject: kexec: Fix make headers_check
+
+commit 9dc5c05f45ca8101025046cda7f8aca8835204f2 upstream.
+
+Remove the unneded declaration for a kexec_load() routine.
+
+Fixes errors like these when running 'make headers_check':
+
+include/uapi/linux/kexec.h: userspace cannot reference function or variable defined in the kernel
+
+Paul said:
+
+: The kexec_load declaration isn't very useful for userspace, see the patch
+: I submitted in http://lkml.kernel.org/r/1389791824.17407.9.camel@x220 .
+: And After my attempt the export of that declaration has also been
+: discussed in
+: http://lkml.kernel.org/r/115373b6ac68ee7a305975896e1c4971e8e51d4c.1408731991.git.geoff@infradead.org
+:
+: In that last discussion no one has been able to point to an actual user of
+: it.  So, as far as I can tell, no one actually uses it.  Which makes
+: sense, because including this header by itself doesn't give one access to
+: a useful definition of kexec_load.  So why bother with the declaration?
+
+Signed-off-by: Geoff Levand <geoff@infradead.org>
+Acked-by: Paul Bolle <pebolle@tiscali.nl>
+Cc: H. Peter Anvin <hpa@zytor.com>
+Cc: Vivek Goyal <vgoyal@redhat.com>
+Cc: Arnd Bergmann <arnd@arndb.de>
+Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
+Cc: Maximilian Attems <max@stro.at>
+Cc: Michal Marek <mmarek@suse.cz>
+Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
+---
+ include/uapi/linux/kexec.h | 6 ------
+ 1 file changed, 6 deletions(-)
+
+--- a/include/uapi/linux/kexec.h
++++ b/include/uapi/linux/kexec.h
+@@ -44,12 +44,6 @@ struct kexec_segment {
+ 	size_t memsz;
+ };
+ 
+-/* Load a new kernel image as described by the kexec_segment array
+- * consisting of passed number of segments at the entry-point address.
+- * The flags allow different useage types.
+- */
+-extern int kexec_load(void *, size_t, struct kexec_segment *,
+-		unsigned long int);
+ #endif /* __KERNEL__ */
+ 
+ #endif /* _UAPILINUX_KEXEC_H */
diff --git a/queue-3.16/mips-asm-compiler-add-new-macros-to-set-isa-and-arch-asm.patch b/queue-3.16/mips-asm-compiler-add-new-macros-to-set-isa-and-arch-asm.patch
new file mode 100644
index 00000000..9aa94531
--- /dev/null
+++ b/queue-3.16/mips-asm-compiler-add-new-macros-to-set-isa-and-arch-asm.patch
@@ -0,0 +1,33 @@
+From: Markos Chandras <markos.chandras@imgtec.com>
+Date: Tue, 18 Nov 2014 15:02:32 +0000
+Subject: MIPS: asm: compiler: Add new macros to set ISA and arch asm
+ annotations
+
+commit be5136988e25ae0dc8379fcb937efc63d87aba9e upstream.
+
+There are certain places where the code uses .set mips32 or .set mips64
+or .set arch=r4000. In preparation of MIPS R6 support, and in order to
+use as less #ifdefs as possible, we define new macros to set similar
+annotations for MIPS R6.
+
+Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
+[bwh: Backported to 3.16: We don't support MIPS R6 but I have applied a
+ commit that uses MIPS_ISA_LEVEL_RAW.  Add the R2 definitions only.]
+Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
+---
+ arch/mips/include/asm/compiler.h | 13 +++++++++++++
+ 1 file changed, 13 insertions(+)
+
+--- a/arch/mips/include/asm/compiler.h
++++ b/arch/mips/include/asm/compiler.h
+@@ -16,4 +16,10 @@
+ #define GCC_REG_ACCUM "accum"
+ #endif
+ 
++/* MIPS64 is a superset of MIPS32 */
++#define MIPS_ISA_LEVEL "mips64r2"
++#define MIPS_ISA_ARCH_LEVEL "arch=r4000"
++#define MIPS_ISA_LEVEL_RAW mips64r2
++#define MIPS_ISA_ARCH_LEVEL_RAW MIPS_ISA_LEVEL_RAW
++
+ #endif /* _ASM_COMPILER_H */
diff --git a/queue-3.16/mips-asmmacro-ensure-64-bit-fp-registers-are-used-with-msa.patch b/queue-3.16/mips-asmmacro-ensure-64-bit-fp-registers-are-used-with-msa.patch
new file mode 100644
index 00000000..23babde3
--- /dev/null
+++ b/queue-3.16/mips-asmmacro-ensure-64-bit-fp-registers-are-used-with-msa.patch
@@ -0,0 +1,98 @@
+From: Markos Chandras <markos.chandras@imgtec.com>
+Date: Thu, 16 Apr 2015 11:05:59 +0100
+Subject: MIPS: asmmacro: Ensure 64-bit FP registers are used with MSA
+
+commit 2bd7bc254ab1f45269db6dd7957d63b713817408 upstream.
+
+This silences warnings like the following one when building with the
+latest binutils:
+
+arch/mips/kernel/genex.S: Assembler messages:
+arch/mips/kernel/genex.S:438: Warning: the `msa' extension requires 64-bit FPRs
+
+[ralf@linux-mips.org: Markos says binutils 2.25 and some 2.24 snapshots
+are affected.]
+
+Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
+Reviewed-by: James Hogan <james.hogan@imgtec.com>
+Cc: Paul Burton <paul.burton@imgtec.com>
+Cc: linux-mips@linux-mips.org
+Patchwork: https://patchwork.linux-mips.org/patch/9745/
+Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
+Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
+---
+ arch/mips/include/asm/asmmacro.h | 11 +++++++++++
+ 1 file changed, 11 insertions(+)
+
+--- a/arch/mips/include/asm/asmmacro.h
++++ b/arch/mips/include/asm/asmmacro.h
+@@ -209,9 +209,13 @@
+ 	.endm
+ 
+ #ifdef TOOLCHAIN_SUPPORTS_MSA
++/* preprocessor replaces the fp in ".set fp=64" with $30 otherwise */
++#undef fp
++
+ 	.macro	_cfcmsa	rd, cs
+ 	.set	push
+ 	.set	mips32r2
++	.set	fp=64
+ 	.set	msa
+ 	cfcmsa	\rd, $\cs
+ 	.set	pop
+@@ -220,6 +224,7 @@
+ 	.macro	_ctcmsa	cd, rs
+ 	.set	push
+ 	.set	mips32r2
++	.set	fp=64
+ 	.set	msa
+ 	ctcmsa	$\cd, \rs
+ 	.set	pop
+@@ -228,6 +233,7 @@
+ 	.macro	ld_d	wd, off, base
+ 	.set	push
+ 	.set	mips32r2
++	.set	fp=64
+ 	.set	msa
+ 	ld.d	$w\wd, \off(\base)
+ 	.set	pop
+@@ -236,6 +242,7 @@
+ 	.macro	st_d	wd, off, base
+ 	.set	push
+ 	.set	mips32r2
++	.set	fp=64
+ 	.set	msa
+ 	st.d	$w\wd, \off(\base)
+ 	.set	pop
+@@ -244,6 +251,7 @@
+ 	.macro	copy_u_w	ws, n
+ 	.set	push
+ 	.set	mips32r2
++	.set	fp=64
+ 	.set	msa
+ 	copy_u.w $1, $w\ws[\n]
+ 	.set	pop
+@@ -252,6 +260,7 @@
+ 	.macro	copy_u_d	ws, n
+ 	.set	push
+ 	.set	mips64r2
++	.set	fp=64
+ 	.set	msa
+ 	copy_u.d $1, $w\ws[\n]
+ 	.set	pop
+@@ -260,6 +269,7 @@
+ 	.macro	insert_w	wd, n
+ 	.set	push
+ 	.set	mips32r2
++	.set	fp=64
+ 	.set	msa
+ 	insert.w $w\wd[\n], $1
+ 	.set	pop
+@@ -268,6 +278,7 @@
+ 	.macro	insert_d	wd, n
+ 	.set	push
+ 	.set	mips64r2
++	.set	fp=64
+ 	.set	msa
+ 	insert.d $w\wd[\n], $1
+ 	.set	pop
diff --git a/queue-3.16/net-wireless-brcm80211-brcmfmac-make-return-type-and-name-reflect.patch b/queue-3.16/net-wireless-brcm80211-brcmfmac-make-return-type-and-name-reflect.patch
new file mode 100644
index 00000000..d7cf0ebf
--- /dev/null
+++ b/queue-3.16/net-wireless-brcm80211-brcmfmac-make-return-type-and-name-reflect.patch
@@ -0,0 +1,69 @@
+From: Rasmus Villemoes <linux@rasmusvillemoes.dk>
+Date: Sun, 22 Jun 2014 20:50:40 +0200
+Subject: net/wireless/brcm80211/brcmfmac: Make return type and name reflect
+ actual semantics
+
+commit e843bb199ba58ce5d1364d4c82fcf6975f08eec2 upstream.
+
+Applying ++ to a bool is equivalent to setting it true, regardless of
+its initial value (bools are not uint1_t). Hence the function
+wl_get_vif_state_all can only ever return true/false. The only in-tree
+caller uses its return value as a boolean. So update its return type,
+and since the list traversal and bit testing have no side effects,
+just return true immediately. Its return value tells if any vif is in
+the specified state, so also rename it to brcmf_get_vif_state_any.
+
+Reviewed-by: Arend van Spriel<arend@broadcom.com>
+Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk>
+Signed-off-by: John W. Linville <linville@tuxdriver.com>
+Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
+---
+ drivers/net/wireless/brcm80211/brcmfmac/p2p.c         | 2 +-
+ drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c | 7 +++----
+ drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.h | 2 +-
+ 3 files changed, 5 insertions(+), 6 deletions(-)
+
+--- a/drivers/net/wireless/brcm80211/brcmfmac/p2p.c
++++ b/drivers/net/wireless/brcm80211/brcmfmac/p2p.c
+@@ -706,7 +706,7 @@ static s32 brcmf_p2p_escan(struct brcmf_
+ 		active = P2PAPI_SCAN_SOCIAL_DWELL_TIME_MS;
+ 	else if (num_chans == AF_PEER_SEARCH_CNT)
+ 		active = P2PAPI_SCAN_AF_SEARCH_DWELL_TIME_MS;
+-	else if (wl_get_vif_state_all(p2p->cfg, BRCMF_VIF_STATUS_CONNECTED))
++	else if (brcmf_get_vif_state_any(p2p->cfg, BRCMF_VIF_STATUS_CONNECTED))
+ 		active = -1;
+ 	else
+ 		active = P2PAPI_SCAN_DWELL_TIME_MS;
+--- a/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
++++ b/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
+@@ -5647,16 +5647,15 @@ enum nl80211_iftype brcmf_cfg80211_get_i
+ 	return wdev->iftype;
+ }
+ 
+-u32 wl_get_vif_state_all(struct brcmf_cfg80211_info *cfg, unsigned long state)
++bool brcmf_get_vif_state_any(struct brcmf_cfg80211_info *cfg, unsigned long state)
+ {
+ 	struct brcmf_cfg80211_vif *vif;
+-	bool result = 0;
+ 
+ 	list_for_each_entry(vif, &cfg->vif_list, list) {
+ 		if (test_bit(state, &vif->sme_state))
+-			result++;
++			return true;
+ 	}
+-	return result;
++	return false;
+ }
+ 
+ static inline bool vif_event_equals(struct brcmf_cfg80211_vif_event *event,
+--- a/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.h
++++ b/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.h
+@@ -477,7 +477,7 @@ const struct brcmf_tlv *
+ brcmf_parse_tlvs(const void *buf, int buflen, uint key);
+ u16 channel_to_chanspec(struct brcmu_d11inf *d11inf,
+ 			struct ieee80211_channel *ch);
+-u32 wl_get_vif_state_all(struct brcmf_cfg80211_info *cfg, unsigned long state);
++bool brcmf_get_vif_state_any(struct brcmf_cfg80211_info *cfg, unsigned long state);
+ void brcmf_cfg80211_arm_vif_event(struct brcmf_cfg80211_info *cfg,
+ 				  struct brcmf_cfg80211_vif *vif);
+ bool brcmf_cfg80211_vif_event_armed(struct brcmf_cfg80211_info *cfg);
diff --git a/queue-3.16/p54-memset-0-whole-array.patch b/queue-3.16/p54-memset-0-whole-array.patch
new file mode 100644
index 00000000..71cf4d37
--- /dev/null
+++ b/queue-3.16/p54-memset-0-whole-array.patch
@@ -0,0 +1,36 @@
+From: Jiri Slaby <jslaby@suse.cz>
+Date: Fri, 14 Oct 2016 11:23:09 +0200
+Subject: p54: memset(0) whole array
+
+commit 6f17581788206444cbbcdbc107498f85e9765e3d upstream.
+
+gcc 7 complains:
+drivers/net/wireless/intersil/p54/fwio.c: In function 'p54_scan':
+drivers/net/wireless/intersil/p54/fwio.c:491:4: warning: 'memset' used with length equal to number of elements without multiplication by element size [-Wmemset-elt-size]
+
+Fix that by passing the correct size to memset.
+
+Signed-off-by: Jiri Slaby <jslaby@suse.cz>
+Cc: Christian Lamparter <chunkeey@googlemail.com>
+Cc: Kalle Valo <kvalo@codeaurora.org>
+Cc: linux-wireless@vger.kernel.org
+Cc: netdev@vger.kernel.org
+Acked-by: Christian Lamparter <chunkeey@googlemail.com>
+Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
+[bwh: Backported to 3.16: adjust filename]
+Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
+---
+ drivers/net/wireless/p54/fwio.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/net/wireless/p54/fwio.c
++++ b/drivers/net/wireless/p54/fwio.c
+@@ -486,7 +486,7 @@ int p54_scan(struct p54_common *priv, u1
+ 
+ 			entry += sizeof(__le16);
+ 			chan->pa_points_per_curve = 8;
+-			memset(chan->curve_data, 0, sizeof(*chan->curve_data));
++			memset(chan->curve_data, 0, sizeof(chan->curve_data));
+ 			memcpy(chan->curve_data, entry,
+ 			       sizeof(struct p54_pa_curve_data_sample) *
+ 			       min((u8)8, curve_data->points_per_channel));
diff --git a/queue-3.16/sched-topology-make-local-variables-static.patch b/queue-3.16/sched-topology-make-local-variables-static.patch
new file mode 100644
index 00000000..8d86e30a
--- /dev/null
+++ b/queue-3.16/sched-topology-make-local-variables-static.patch
@@ -0,0 +1,31 @@
+From: zhong jiang <zhongjiang@huawei.com>
+Date: Fri, 3 Aug 2018 20:37:32 +0800
+Subject: sched/topology: Make local variables static
+
+commit ace8031099f91480799b5929b4cccf2dcacc5136 upstream.
+
+Fix the following warnings:
+
+  kernel/sched/topology.c:10:15: warning: symbol 'sched_domains_tmpmask' was not declared. Should it be static?
+  kernel/sched/topology.c:11:15: warning: symbol 'sched_domains_tmpmask2' was not declared. Should it be static?
+
+Signed-off-by: zhong jiang <zhongjiang@huawei.com>
+Cc: Linus Torvalds <torvalds@linux-foundation.org>
+Cc: Peter Zijlstra <peterz@infradead.org>
+Cc: Thomas Gleixner <tglx@linutronix.de>
+Link: http://lkml.kernel.org/r/1533299852-26941-1-git-send-email-zhongjiang@huawei.com
+Signed-off-by: Ingo Molnar <mingo@kernel.org>
+[bwh: Backported to 3.16: adjust filename, context]
+Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
+---
+--- a/kernel/sched/core.c
++++ b/kernel/sched/core.c
+@@ -5286,7 +5286,7 @@ early_initcall(migration_init);
+ #ifdef CONFIG_SMP
+ 
+ static cpumask_var_t sched_domains_tmpmask; /* sched_domains_mutex */
+-cpumask_var_t sched_domains_tmpmask2;
++static cpumask_var_t sched_domains_tmpmask2;
+ 
+ #ifdef CONFIG_SCHED_DEBUG
+ 
diff --git a/queue-3.16/series b/queue-3.16/series
index eaec6af5..bd777c72 100644
--- a/queue-3.16/series
+++ b/queue-3.16/series
@@ -338,3 +338,14 @@ gcov-add-support-for-gcc-version-6.patch
 gcov-support-gcc-7.1.patch
 kvm-x86-fix-escape-of-guest-dr6-to-the-host.patch
 iio-iio-trig-periodic-rtc-free-trigger-resource-correctly.patch
+mips-asm-compiler-add-new-macros-to-set-isa-and-arch-asm.patch
+clk-si5351-constify-clock-names-and-struct-regmap_config.patch
+net-wireless-brcm80211-brcmfmac-make-return-type-and-name-reflect.patch
+ir-core-fix-gcc-7-warning-on-bool-arithmetic.patch
+p54-memset-0-whole-array.patch
+kexec-fix-make-headers_check.patch
+arm64-use-linux-types.h-in-kvm.h.patch
+mips-asmmacro-ensure-64-bit-fp-registers-are-used-with-msa.patch
+x86-apic-fix-build-failure-with-x86_io_apic-disabled.patch
+sched-topology-make-local-variables-static.patch
+usb-misc-usb3503-update-error-code-in-print-message.patch
diff --git a/queue-3.16/usb-misc-usb3503-update-error-code-in-print-message.patch b/queue-3.16/usb-misc-usb3503-update-error-code-in-print-message.patch
new file mode 100644
index 00000000..59d525d1
--- /dev/null
+++ b/queue-3.16/usb-misc-usb3503-update-error-code-in-print-message.patch
@@ -0,0 +1,37 @@
+From: Tushar Behera <tushar.b@samsung.com>
+Date: Tue, 17 Jun 2014 16:38:50 +0530
+Subject: usb: misc: usb3503: Update error code in print message
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+commit ec5734c41bee2ee7c938a8f34853d31cada7e67a upstream.
+
+'err' is uninitialized, rather print the error code directly.
+
+This also fixes following warning.
+drivers/usb/misc/usb3503.c: In function ‘usb3503_probe’:
+drivers/usb/misc/usb3503.c:195:11: warning: ‘err’ may be used uninitialized
+in this function [-Wmaybe-uninitialized]
+    dev_err(dev, "unable to request refclk (%d)\n", err);
+
+Signed-off-by: Tushar Behera <tushar.b@samsung.com>
+Acked-by: Marek Szyprowski <m.szyprowski@samsung.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
+---
+ drivers/usb/misc/usb3503.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- a/drivers/usb/misc/usb3503.c
++++ b/drivers/usb/misc/usb3503.c
+@@ -192,7 +192,8 @@ static int usb3503_probe(struct usb3503
+ 
+ 		clk = devm_clk_get(dev, "refclk");
+ 		if (IS_ERR(clk) && PTR_ERR(clk) != -ENOENT) {
+-			dev_err(dev, "unable to request refclk (%d)\n", err);
++			dev_err(dev, "unable to request refclk (%ld)\n",
++					PTR_ERR(clk));
+ 			return PTR_ERR(clk);
+ 		}
+ 
diff --git a/queue-3.16/x86-apic-fix-build-failure-with-x86_io_apic-disabled.patch b/queue-3.16/x86-apic-fix-build-failure-with-x86_io_apic-disabled.patch
new file mode 100644
index 00000000..a72d5e89
--- /dev/null
+++ b/queue-3.16/x86-apic-fix-build-failure-with-x86_io_apic-disabled.patch
@@ -0,0 +1,38 @@
+From: Ben Hutchings <ben@decadent.org.uk>
+Date: Sun, 11 Nov 2018 01:02:49 +0000
+Subject: x86/apic: Fix build failure with X86_IO_APIC disabled
+
+My backport of commit 2e63ad4bd5dd "x86/apic: Do not init irq
+remapping if ioapic is disabled" added an unconditional use of
+skip_ioapic_setup.  Enabling X86_LOCAL_APIC but not X86_IO_APIC
+results in a build failure.
+
+This configuration was made impossible by commit b1da1e715d4f
+"x86/Kconfig: Simplify X86_IO_APIC dependencies", but that seems to
+depend on additional changes that aren't suitable for stable.
+
+The function that was changed, enable_IR_x2apic(), is only used in
+64-bit configurations where CONFIG_X86_IO_APIC is always enabled.  So
+extend the #ifdef CONFIG_X86_64 section to include this function.
+
+Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
+---
+--- a/arch/x86/kernel/apic/apic.c
++++ b/arch/x86/kernel/apic/apic.c
+@@ -1609,6 +1609,8 @@ int __init enable_IR(void)
+ 	return -1;
+ }
+ 
++#ifdef CONFIG_X86_64
++
+ void __init enable_IR_x2apic(void)
+ {
+ 	unsigned long flags;
+@@ -1683,7 +1685,6 @@ skip_x2apic:
+ 	local_irq_restore(flags);
+ }
+ 
+-#ifdef CONFIG_X86_64
+ /*
+  * Detect and enable local APICs on non-SMP boards.
+  * Original code written by Keir Fraser.