From: Greg Kroah-Hartman Date: Wed, 3 Dec 2014 19:33:04 +0000 (-0800) Subject: 3.10-stable patches X-Git-Tag: v3.10.62~38 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=50914f173113a372149866993afab869c1d8bd46;p=thirdparty%2Fkernel%2Fstable-queue.git 3.10-stable patches added patches: mips-loongson-make-platform-serial-setup-always-built-in.patch mips-oprofile-fix-backtrace-on-64-bit-kernel.patch --- diff --git a/queue-3.10/mips-loongson-make-platform-serial-setup-always-built-in.patch b/queue-3.10/mips-loongson-make-platform-serial-setup-always-built-in.patch new file mode 100644 index 00000000000..1201eb87eb5 --- /dev/null +++ b/queue-3.10/mips-loongson-make-platform-serial-setup-always-built-in.patch @@ -0,0 +1,41 @@ +From 26927f76499849e095714452b8a4e09350f6a3b9 Mon Sep 17 00:00:00 2001 +From: Aaro Koskinen +Date: Thu, 20 Nov 2014 01:05:38 +0200 +Subject: MIPS: Loongson: Make platform serial setup always built-in. + +From: Aaro Koskinen + +commit 26927f76499849e095714452b8a4e09350f6a3b9 upstream. + +If SERIAL_8250 is compiled as a module, the platform specific setup +for Loongson will be a module too, and it will not work very well. +At least on Loongson 3 it will trigger a build failure, +since loongson_sysconf is not exported to modules. + +Fix by making the platform specific serial code always built-in. + +Signed-off-by: Aaro Koskinen +Reported-by: Ralf Baechle +Cc: linux-mips@linux-mips.org +Cc: Huacai Chen +Cc: Markos Chandras +Patchwork: https://patchwork.linux-mips.org/patch/8533/ +Signed-off-by: Ralf Baechle +Signed-off-by: Greg Kroah-Hartman + +--- + arch/mips/loongson/common/Makefile | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +--- a/arch/mips/loongson/common/Makefile ++++ b/arch/mips/loongson/common/Makefile +@@ -10,7 +10,8 @@ obj-$(CONFIG_GPIOLIB) += gpio.o + # Serial port support + # + obj-$(CONFIG_EARLY_PRINTK) += early_printk.o +-obj-$(CONFIG_SERIAL_8250) += serial.o ++loongson-serial-$(CONFIG_SERIAL_8250) := serial.o ++obj-y += $(loongson-serial-m) $(loongson-serial-y) + obj-$(CONFIG_LOONGSON_UART_BASE) += uart_base.o + obj-$(CONFIG_LOONGSON_MC146818) += rtc.o + diff --git a/queue-3.10/mips-oprofile-fix-backtrace-on-64-bit-kernel.patch b/queue-3.10/mips-oprofile-fix-backtrace-on-64-bit-kernel.patch new file mode 100644 index 00000000000..79583cf7686 --- /dev/null +++ b/queue-3.10/mips-oprofile-fix-backtrace-on-64-bit-kernel.patch @@ -0,0 +1,33 @@ +From bbaf113a481b6ce32444c125807ad3618643ce57 Mon Sep 17 00:00:00 2001 +From: Aaro Koskinen +Date: Fri, 17 Oct 2014 18:10:24 +0300 +Subject: MIPS: oprofile: Fix backtrace on 64-bit kernel + +From: Aaro Koskinen + +commit bbaf113a481b6ce32444c125807ad3618643ce57 upstream. + +Fix incorrect cast that always results in wrong address for the new +frame on 64-bit kernels. + +Signed-off-by: Aaro Koskinen +Cc: linux-mips@linux-mips.org +Patchwork: https://patchwork.linux-mips.org/patch/8110/ +Signed-off-by: Ralf Baechle +Signed-off-by: Greg Kroah-Hartman + +--- + arch/mips/oprofile/backtrace.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/arch/mips/oprofile/backtrace.c ++++ b/arch/mips/oprofile/backtrace.c +@@ -92,7 +92,7 @@ static inline int unwind_user_frame(stru + /* This marks the end of the previous function, + which means we overran. */ + break; +- stack_size = (unsigned) stack_adjustment; ++ stack_size = (unsigned long) stack_adjustment; + } else if (is_ra_save_ins(&ip)) { + int ra_slot = ip.i_format.simmediate; + if (ra_slot < 0) diff --git a/queue-3.10/series b/queue-3.10/series new file mode 100644 index 00000000000..6b6616f5810 --- /dev/null +++ b/queue-3.10/series @@ -0,0 +1,2 @@ +mips-oprofile-fix-backtrace-on-64-bit-kernel.patch +mips-loongson-make-platform-serial-setup-always-built-in.patch diff --git a/queue-3.14/series b/queue-3.14/series new file mode 100644 index 00000000000..6b6616f5810 --- /dev/null +++ b/queue-3.14/series @@ -0,0 +1,2 @@ +mips-oprofile-fix-backtrace-on-64-bit-kernel.patch +mips-loongson-make-platform-serial-setup-always-built-in.patch diff --git a/queue-3.17/series b/queue-3.17/series new file mode 100644 index 00000000000..9eec88604d4 --- /dev/null +++ b/queue-3.17/series @@ -0,0 +1,11 @@ +mips-ip27-fix-__node_distances-undefined-error.patch +mips-lib-memcpy-restore-nop-on-delay-slot-before-returning-to-caller.patch +mips-oprofile-fix-backtrace-on-64-bit-kernel.patch +mips-tlb-r4k-add-missing-htw-stop-start-sequences.patch +mips-loongson3-fix-__node_distances-undefined-error.patch +mips-asm-uaccess-add-v1-register-to-clobber-list-on-eva.patch +mips-cpu-probe-set-the-ftlb-probability-bit-on-supported-cores.patch +mips-fix-eva-non-smp-non-fpu-fp-context-signal-handling.patch +mips-r4kcache-add-eva-case-for-protected_writeback_dcache_line.patch +mips-tlbex-fix-potential-htw-race-on-tlbl-m-s-handlers.patch +mips-loongson-make-platform-serial-setup-always-built-in.patch