projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'linux-4.7' of git://github.com/skeggsb/linux into drm-fixes
[cascardo/linux.git]
/
arch
/
parisc
/
kernel
/
entry.S
diff --git
a/arch/parisc/kernel/entry.S
b/arch/parisc/kernel/entry.S
index
39127d3
..
baa3d9d
100644
(file)
--- a/
arch/parisc/kernel/entry.S
+++ b/
arch/parisc/kernel/entry.S
@@
-667,7
+667,7
@@
* boundary
*/
* boundary
*/
- .
tex
t
+ .
section .text.ho
t
.align 2048
ENTRY(fault_vector_20)
.align 2048
ENTRY(fault_vector_20)
@@
-2019,6
+2019,7
@@
ftrace_stub:
.procend
ENDPROC(mcount)
.procend
ENDPROC(mcount)
+#ifdef CONFIG_FUNCTION_GRAPH_TRACER
.align 8
.globl return_to_handler
.type return_to_handler, @function
.align 8
.globl return_to_handler
.type return_to_handler, @function
@@
-2040,11
+2041,17
@@
parisc_return_to_handler:
#endif
/* call ftrace_return_to_handler(0) */
#endif
/* call ftrace_return_to_handler(0) */
+ .import ftrace_return_to_handler,code
+ load32 ftrace_return_to_handler,%ret0
+ load32 .Lftrace_ret,%r2
#ifdef CONFIG_64BIT
ldo -16(%sp),%ret1 /* Reference param save area */
#ifdef CONFIG_64BIT
ldo -16(%sp),%ret1 /* Reference param save area */
+ bve (%ret0)
+#else
+ bv %r0(%ret0)
#endif
#endif
- BL ftrace_return_to_handler,%r2
ldi 0,%r26
ldi 0,%r26
+.Lftrace_ret:
copy %ret0,%rp
/* restore original return values */
copy %ret0,%rp
/* restore original return values */
@@
-2062,6
+2069,8
@@
parisc_return_to_handler:
.procend
ENDPROC(return_to_handler)
.procend
ENDPROC(return_to_handler)
+#endif /* CONFIG_FUNCTION_GRAPH_TRACER */
+
#endif /* CONFIG_FUNCTION_TRACER */
#ifdef CONFIG_IRQSTACKS
#endif /* CONFIG_FUNCTION_TRACER */
#ifdef CONFIG_IRQSTACKS