From: Greg Kroah-Hartman Date: Thu, 26 Apr 2018 06:57:09 +0000 (+0200) Subject: drop 2 mips patches X-Git-Tag: v4.16.5~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=05819716a3bd630dde58d40b31b1009831f0f19e;p=thirdparty%2Fkernel%2Fstable-queue.git drop 2 mips patches --- diff --git a/queue-4.14/mips-generic-fix-machine-compatible-matching.patch b/queue-4.14/mips-generic-fix-machine-compatible-matching.patch deleted file mode 100644 index 4fbe268d08c..00000000000 --- a/queue-4.14/mips-generic-fix-machine-compatible-matching.patch +++ /dev/null @@ -1,43 +0,0 @@ -From foo@baz Tue Apr 24 15:29:20 CEST 2018 -From: James Hogan -Date: Fri, 2 Feb 2018 22:14:09 +0000 -Subject: MIPS: generic: Fix machine compatible matching - -From: James Hogan - - -[ Upstream commit 9a9ab3078e2744a1a55163cfaec73a5798aae33e ] - -We now have a platform (Ranchu) in the "generic" platform which matches -based on the FDT compatible string using mips_machine_is_compatible(), -however that function doesn't stop at a blank struct -of_device_id::compatible as that is an array in the struct, not a -pointer to a string. - -Fix the loop completion to check the first byte of the compatible array -rather than the address of the compatible array in the struct. - -Fixes: eed0eabd12ef ("MIPS: generic: Introduce generic DT-based board support") -Signed-off-by: James Hogan -Reviewed-by: Paul Burton -Reviewed-by: Matt Redfearn -Cc: Ralf Baechle -Cc: linux-mips@linux-mips.org -Patchwork: https://patchwork.linux-mips.org/patch/18580/ -Signed-off-by: Sasha Levin -Signed-off-by: Greg Kroah-Hartman ---- - arch/mips/include/asm/machine.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/arch/mips/include/asm/machine.h -+++ b/arch/mips/include/asm/machine.h -@@ -52,7 +52,7 @@ mips_machine_is_compatible(const struct - if (!mach->matches) - return NULL; - -- for (match = mach->matches; match->compatible; match++) { -+ for (match = mach->matches; match->compatible[0]; match++) { - if (fdt_node_check_compatible(fdt, 0, match->compatible) == 0) - return match; - } diff --git a/queue-4.14/series b/queue-4.14/series index 8ba17995f0a..95b1bea6257 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -130,7 +130,6 @@ acpi-processor_perflib-do-not-send-_ppc-change-notification-if-not-ready.patch acpi-bus-do-not-call-_sta-on-battery-devices-with-unmet-dependencies.patch acpi-scan-use-acpi_bus_get_status-to-initialize-acpi_type_device-devs.patch bpf-fix-selftests-bpf-test_kmod.sh-failure-when-config_bpf_jit_always_on-y.patch -mips-generic-fix-machine-compatible-matching.patch mips-txx9-use-is_builtin-for-config_leds_class.patch perf-record-fix-period-option-handling.patch mips-generic-support-gic-in-eic-mode.patch diff --git a/queue-4.9/mips-fix-mem-x-y-commandline-processing.patch b/queue-4.9/mips-fix-mem-x-y-commandline-processing.patch deleted file mode 100644 index 69cf4eff909..00000000000 --- a/queue-4.9/mips-fix-mem-x-y-commandline-processing.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 73fbc1eba7ffa3bf0ad12486232a8a1edb4e4411 Mon Sep 17 00:00:00 2001 -From: Marcin Nowakowski -Date: Wed, 23 Nov 2016 14:43:49 +0100 -Subject: MIPS: fix mem=X@Y commandline processing - -From: Marcin Nowakowski - -commit 73fbc1eba7ffa3bf0ad12486232a8a1edb4e4411 upstream. - -When a memory offset is specified through the commandline, add the -memory in range PHYS_OFFSET:Y as reserved memory area. -Otherwise the bootmem allocator is initialised with low page equal to -min_low_pfn = PHYS_OFFSET, and in free_all_bootmem will process pages -starting from min_low_pfn instead of PFN(Y). - -Signed-off-by: Marcin Nowakowski -Cc: linux-mips@linux-mips.org -Patchwork: https://patchwork.linux-mips.org/patch/14613/ -Signed-off-by: Ralf Baechle -Cc: Amit Pundir -Signed-off-by: Greg Kroah-Hartman - ---- - arch/mips/kernel/setup.c | 4 ++++ - 1 file changed, 4 insertions(+) - ---- a/arch/mips/kernel/setup.c -+++ b/arch/mips/kernel/setup.c -@@ -661,6 +661,10 @@ static int __init early_parse_mem(char * - start = memparse(p + 1, &p); - - add_memory_region(start, size, BOOT_MEM_RAM); -+ -+ if (start && start > PHYS_OFFSET) -+ add_memory_region(PHYS_OFFSET, start - PHYS_OFFSET, -+ BOOT_MEM_RESERVED); - return 0; - } - early_param("mem", early_parse_mem); diff --git a/queue-4.9/series b/queue-4.9/series index 1d993fcd1d0..745ce7e8f43 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -12,7 +12,6 @@ mips-generic-fix-big-endian-cpus-on-generic-machine.patch input-drv260x-fix-initializing-overdrive-voltage.patch power-supply-bq2415x-check-for-null-acpi_id-to-avoid-null-pointer-dereference.patch stk-webcam-fix-an-endian-bug-in-stk_camera_read_reg.patch -mips-fix-mem-x-y-commandline-processing.patch of-prevent-unaligned-access-in-of_alias_scan.patch irqchip-mips-gic-fix-local-interrupts.patch ath9k_hw-check-if-the-chip-failed-to-wake-up.patch