diff options
| author | Steven Rostedt (Red Hat) <rostedt@goodmis.org> | 2014-10-31 14:49:35 -0400 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2014-10-31 14:49:35 -0400 |
| commit | ce2965d967847ed4a6df046b0e44bdba41b29e4f (patch) | |
| tree | 3e7d6dc77dd4cf4ef46475f5dd260cf02f2b26a9 /arch/mips | |
| parent | a6c33bd321b02b52f953e89c5775db6a2bd7b23c (diff) | |
| parent | 2023c00d650dfa409e58539596aca7d9deded824 (diff) | |
Merge tag 'v3.14.20' into v3.14-rt
This is the 3.14.20 stable release
Diffstat (limited to 'arch/mips')
| -rw-r--r-- | arch/mips/boot/compressed/decompress.c | 1 | ||||
| -rw-r--r-- | arch/mips/kernel/mcount.S | 12 |
2 files changed, 13 insertions, 0 deletions
diff --git a/arch/mips/boot/compressed/decompress.c b/arch/mips/boot/compressed/decompress.c index c00c4ddf4514..5244cecf1e45 100644 --- a/arch/mips/boot/compressed/decompress.c +++ b/arch/mips/boot/compressed/decompress.c @@ -13,6 +13,7 @@ #include <linux/types.h> #include <linux/kernel.h> +#include <linux/string.h> #include <asm/addrspace.h> diff --git a/arch/mips/kernel/mcount.S b/arch/mips/kernel/mcount.S index 539b6294b613..8f89ff4ed524 100644 --- a/arch/mips/kernel/mcount.S +++ b/arch/mips/kernel/mcount.S @@ -123,7 +123,11 @@ NESTED(_mcount, PT_SIZE, ra) nop #endif b ftrace_stub +#ifdef CONFIG_32BIT + addiu sp, sp, 8 +#else nop +#endif static_trace: MCOUNT_SAVE_REGS @@ -133,6 +137,9 @@ static_trace: move a1, AT /* arg2: parent's return address */ MCOUNT_RESTORE_REGS +#ifdef CONFIG_32BIT + addiu sp, sp, 8 +#endif .globl ftrace_stub ftrace_stub: RETURN_BACK @@ -177,6 +184,11 @@ NESTED(ftrace_graph_caller, PT_SIZE, ra) jal prepare_ftrace_return nop MCOUNT_RESTORE_REGS +#ifndef CONFIG_DYNAMIC_FTRACE +#ifdef CONFIG_32BIT + addiu sp, sp, 8 +#endif +#endif RETURN_BACK END(ftrace_graph_caller) |