git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
pandora: defconfig: update
[pandora-kernel.git]
/
arch
/
mips
/
kernel
/
mcount.S
diff --git
a/arch/mips/kernel/mcount.S
b/arch/mips/kernel/mcount.S
index
4c968e7
..
55eca41
100644
(file)
--- a/
arch/mips/kernel/mcount.S
+++ b/
arch/mips/kernel/mcount.S
@@
-119,7
+119,11
@@
NESTED(_mcount, PT_SIZE, ra)
nop
#endif
b ftrace_stub
nop
#endif
b ftrace_stub
+#ifdef CONFIG_32BIT
+ addiu sp, sp, 8
+#else
nop
nop
+#endif
static_trace:
MCOUNT_SAVE_REGS
static_trace:
MCOUNT_SAVE_REGS
@@
-129,6
+133,9
@@
static_trace:
move a1, AT /* arg2: parent's return address */
MCOUNT_RESTORE_REGS
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
.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
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)
RETURN_BACK
END(ftrace_graph_caller)