From 611d11a59a206662b8ea9b1c66a478af92ca5cda Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 9 Jan 2017 13:06:44 +0100 Subject: [PATCH] 4.4-stable patches added patches: ath10k-use-the-right-length-of-background.patch cris-only-build-flash-rescue-image-if-config_etrax_axisflashmap-is-selected.patch --- ...k-use-the-right-length-of-background.patch | 32 +++++++++++ ...onfig_etrax_axisflashmap-is-selected.patch | 56 +++++++++++++++++++ queue-4.4/series | 2 + 3 files changed, 90 insertions(+) create mode 100644 queue-4.4/ath10k-use-the-right-length-of-background.patch create mode 100644 queue-4.4/cris-only-build-flash-rescue-image-if-config_etrax_axisflashmap-is-selected.patch diff --git a/queue-4.4/ath10k-use-the-right-length-of-background.patch b/queue-4.4/ath10k-use-the-right-length-of-background.patch new file mode 100644 index 00000000000..9f4d6a34d46 --- /dev/null +++ b/queue-4.4/ath10k-use-the-right-length-of-background.patch @@ -0,0 +1,32 @@ +From 31b239824ece321c09bdb8e61e1d14814eaba38b Mon Sep 17 00:00:00 2001 +From: Nicolas Iooss +Date: Sat, 29 Oct 2016 13:17:37 +0200 +Subject: ath10k: use the right length of "background" + +From: Nicolas Iooss + +commit 31b239824ece321c09bdb8e61e1d14814eaba38b upstream. + +The word "background" contains 10 characters so the third argument of +strncmp() need to be 10 in order to match this prefix correctly. + +Signed-off-by: Nicolas Iooss +Fixes: 855aed1220d2 ("ath10k: add spectral scan feature") +Signed-off-by: Kalle Valo +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/net/wireless/ath/ath10k/spectral.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/net/wireless/ath/ath10k/spectral.c ++++ b/drivers/net/wireless/ath/ath10k/spectral.c +@@ -338,7 +338,7 @@ static ssize_t write_file_spec_scan_ctl( + } else { + res = -EINVAL; + } +- } else if (strncmp("background", buf, 9) == 0) { ++ } else if (strncmp("background", buf, 10) == 0) { + res = ath10k_spectral_scan_config(ar, SPECTRAL_BACKGROUND); + } else if (strncmp("manual", buf, 6) == 0) { + res = ath10k_spectral_scan_config(ar, SPECTRAL_MANUAL); diff --git a/queue-4.4/cris-only-build-flash-rescue-image-if-config_etrax_axisflashmap-is-selected.patch b/queue-4.4/cris-only-build-flash-rescue-image-if-config_etrax_axisflashmap-is-selected.patch new file mode 100644 index 00000000000..bd258249b28 --- /dev/null +++ b/queue-4.4/cris-only-build-flash-rescue-image-if-config_etrax_axisflashmap-is-selected.patch @@ -0,0 +1,56 @@ +From 328cf6927bb72cadefddebbc9a23c793108147a2 Mon Sep 17 00:00:00 2001 +From: Guenter Roeck +Date: Sun, 30 Oct 2016 09:09:18 -0700 +Subject: cris: Only build flash rescue image if CONFIG_ETRAX_AXISFLASHMAP is selected + +From: Guenter Roeck + +commit 328cf6927bb72cadefddebbc9a23c793108147a2 upstream. + +If CONFIG_ETRAX_AXISFLASHMAP is not configured, the flash rescue image +object file is empty. With recent versions of binutils, this results +in the following build error. + +cris-linux-objcopy: error: + the input file 'arch/cris/boot/rescue/rescue.o' has no sections + +This is seen, for example, when trying to build cris:allnoconfig +with recently generated toolchains. + +Since it does not make sense to build a flash rescue image if there is +no flash, only build it if CONFIG_ETRAX_AXISFLASHMAP is enabled. + +Reported-by: kbuild test robot +Fixes: 66ab3a74c5ce ("CRIS: Merge machine dependent boot/compressed ..") +Signed-off-by: Guenter Roeck +Signed-off-by: Jesper Nilsson +Signed-off-by: Greg Kroah-Hartman + +--- + arch/cris/boot/rescue/Makefile | 8 ++++++++ + 1 file changed, 8 insertions(+) + +--- a/arch/cris/boot/rescue/Makefile ++++ b/arch/cris/boot/rescue/Makefile +@@ -10,6 +10,9 @@ + + asflags-y += $(LINUXINCLUDE) + ccflags-y += -O2 $(LINUXINCLUDE) ++ ++ifdef CONFIG_ETRAX_AXISFLASHMAP ++ + arch-$(CONFIG_ETRAX_ARCH_V10) = v10 + arch-$(CONFIG_ETRAX_ARCH_V32) = v32 + +@@ -28,6 +31,11 @@ $(obj)/rescue.bin: $(obj)/rescue.o FORCE + $(call if_changed,objcopy) + cp -p $(obj)/rescue.bin $(objtree) + ++else ++$(obj)/rescue.bin: ++ ++endif ++ + $(obj)/testrescue.bin: $(obj)/testrescue.o + $(OBJCOPY) $(OBJCOPYFLAGS) $(obj)/testrescue.o tr.bin + # Pad it to 784 bytes diff --git a/queue-4.4/series b/queue-4.4/series index e8c1ff32433..5782dbd6211 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -62,3 +62,5 @@ usb-dwc3-gadget-always-unmap-ep0-requests.patch usb-dwc3-ep0-add-dwc3_ep0_prepare_one_trb.patch usb-dwc3-ep0-explicitly-call-dwc3_ep0_prepare_one_trb.patch stable-fixup-hotplug-fix-unused-function-warning.patch +ath10k-use-the-right-length-of-background.patch +cris-only-build-flash-rescue-image-if-config_etrax_axisflashmap-is-selected.patch -- 2.47.3