diff options
| author | Mark Brown <broonie@kernel.org> | 2014-12-08 11:58:06 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-12-08 11:58:06 +0000 |
| commit | c7967968776bf0f22749fb8908f5979dc981b106 (patch) | |
| tree | 9803d70c093e025e54d6414af1cc09494f6c4682 /arch/mips | |
| parent | bb018056bccfd07de14383ff0be5946acfabfe12 (diff) | |
| parent | 49c42b458929aa5df4f3df028f34f49ceb1388e8 (diff) | |
Merge branch 'linux-linaro-lsk-v3.14' into linux-linaro-lsk-v3.14-rt
Conflicts:
arch/x86/kernel/traps.c
Diffstat (limited to 'arch/mips')
| -rw-r--r-- | arch/mips/loongson/common/Makefile | 3 | ||||
| -rw-r--r-- | arch/mips/oprofile/backtrace.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/arch/mips/loongson/common/Makefile b/arch/mips/loongson/common/Makefile index 9e4484ccbb03..9005a8d60969 100644 --- 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/arch/mips/oprofile/backtrace.c b/arch/mips/oprofile/backtrace.c index 6854ed5097d2..83a1dfd8f0e3 100644 --- a/arch/mips/oprofile/backtrace.c +++ b/arch/mips/oprofile/backtrace.c @@ -92,7 +92,7 @@ static inline int unwind_user_frame(struct stackframe *old_frame, /* 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) |