From 65e20ca98beec56d1166960702fe8779727eec1e Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 3 Dec 2014 11:33:11 -0800 Subject: [PATCH] 3.14-stable patches added patches: mips-loongson-make-platform-serial-setup-always-built-in.patch mips-oprofile-fix-backtrace-on-64-bit-kernel.patch --- ...latform-serial-setup-always-built-in.patch | 41 +++++++++++++++++++ ...ofile-fix-backtrace-on-64-bit-kernel.patch | 33 +++++++++++++++ 2 files changed, 74 insertions(+) create mode 100644 queue-3.14/mips-loongson-make-platform-serial-setup-always-built-in.patch create mode 100644 queue-3.14/mips-oprofile-fix-backtrace-on-64-bit-kernel.patch diff --git a/queue-3.14/mips-loongson-make-platform-serial-setup-always-built-in.patch b/queue-3.14/mips-loongson-make-platform-serial-setup-always-built-in.patch new file mode 100644 index 00000000000..14d513a57e7 --- /dev/null +++ b/queue-3.14/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 +@@ -11,7 +11,8 @@ obj-$(CONFIG_PCI) += pci.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.14/mips-oprofile-fix-backtrace-on-64-bit-kernel.patch b/queue-3.14/mips-oprofile-fix-backtrace-on-64-bit-kernel.patch new file mode 100644 index 00000000000..79583cf7686 --- /dev/null +++ b/queue-3.14/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) -- 2.47.3