projects
/
platform
/
kernel
/
linux-rpi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
x86: Prepare inline-asm for straight-line-speculation
[platform/kernel/linux-rpi.git]
/
samples
/
ftrace
/
ftrace-direct-modify.c
diff --git
a/samples/ftrace/ftrace-direct-modify.c
b/samples/ftrace/ftrace-direct-modify.c
index
5b9a099
..
d620f3d
100644
(file)
--- a/
samples/ftrace/ftrace-direct-modify.c
+++ b/
samples/ftrace/ftrace-direct-modify.c
@@
-3,6
+3,9
@@
#include <linux/kthread.h>
#include <linux/ftrace.h>
#include <linux/kthread.h>
#include <linux/ftrace.h>
+extern void my_direct_func1(void);
+extern void my_direct_func2(void);
+
void my_direct_func1(void)
{
trace_printk("my direct func1\n");
void my_direct_func1(void)
{
trace_printk("my direct func1\n");
@@
-28,7
+31,7
@@
asm (
" call my_direct_func1\n"
" leave\n"
" .size my_tramp1, .-my_tramp1\n"
" call my_direct_func1\n"
" leave\n"
" .size my_tramp1, .-my_tramp1\n"
-" ret\n"
+ ASM_RET
" .type my_tramp2, @function\n"
" .globl my_tramp2\n"
" my_tramp2:"
" .type my_tramp2, @function\n"
" .globl my_tramp2\n"
" my_tramp2:"
@@
-36,7
+39,7
@@
asm (
" movq %rsp, %rbp\n"
" call my_direct_func2\n"
" leave\n"
" movq %rsp, %rbp\n"
" call my_direct_func2\n"
" leave\n"
-" ret\n"
+ ASM_RET
" .size my_tramp2, .-my_tramp2\n"
" .popsection\n"
);
" .size my_tramp2, .-my_tramp2\n"
" .popsection\n"
);