diff options
| author | Steven Rostedt (VMware) <rostedt@goodmis.org> | 2019-03-26 15:31:57 -0400 |
|---|---|---|
| committer | Steven Rostedt (VMware) <rostedt@goodmis.org> | 2019-03-27 08:58:54 -0400 |
| commit | e5e9c17efe77dbbc9b041a517705e0b6c1866110 (patch) | |
| tree | d191db7bfce550a5368d22d392b0de260cd1f73c /arch/x86/kernel/kprobes/opt.c | |
| parent | fe8ac4c919832f77fa96e90caef8559088ec8f40 (diff) | |
| parent | a2cddfe2ce6e9108341820fff8af46713685b2cb (diff) | |
Merge tag 'v4.19.31' into v4.19-rt
This is the 4.19.31 stable release
Conflicts:
mm/swap.c
Diffstat (limited to 'arch/x86/kernel/kprobes/opt.c')
| -rw-r--r-- | arch/x86/kernel/kprobes/opt.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/x86/kernel/kprobes/opt.c b/arch/x86/kernel/kprobes/opt.c index 6adf6e6c2933..544bd41a514c 100644 --- a/arch/x86/kernel/kprobes/opt.c +++ b/arch/x86/kernel/kprobes/opt.c @@ -141,6 +141,11 @@ asm ( void optprobe_template_func(void); STACK_FRAME_NON_STANDARD(optprobe_template_func); +NOKPROBE_SYMBOL(optprobe_template_func); +NOKPROBE_SYMBOL(optprobe_template_entry); +NOKPROBE_SYMBOL(optprobe_template_val); +NOKPROBE_SYMBOL(optprobe_template_call); +NOKPROBE_SYMBOL(optprobe_template_end); #define TMPL_MOVE_IDX \ ((long)optprobe_template_val - (long)optprobe_template_entry) |