projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge v5.14-rc3 into usb-next
[linux-2.6-microblaze.git]
/
arch
/
s390
/
kernel
/
ftrace.c
diff --git
a/arch/s390/kernel/ftrace.c
b/arch/s390/kernel/ftrace.c
index
c6ddeb5
..
2d8f595
100644
(file)
--- a/
arch/s390/kernel/ftrace.c
+++ b/
arch/s390/kernel/ftrace.c
@@
-40,6
+40,7
@@
* trampoline (ftrace_plt), which clobbers also r1.
*/
* trampoline (ftrace_plt), which clobbers also r1.
*/
+void *ftrace_func __read_mostly = ftrace_stub;
unsigned long ftrace_plt;
int ftrace_modify_call(struct dyn_ftrace *rec, unsigned long old_addr,
unsigned long ftrace_plt;
int ftrace_modify_call(struct dyn_ftrace *rec, unsigned long old_addr,
@@
-85,6
+86,7
@@
int ftrace_make_call(struct dyn_ftrace *rec, unsigned long addr)
int ftrace_update_ftrace_func(ftrace_func_t func)
{
int ftrace_update_ftrace_func(ftrace_func_t func)
{
+ ftrace_func = func;
return 0;
}
return 0;
}