diff options
author | 2020-05-19 15:50:34 +0200 | |
---|---|---|
committer | 2020-05-19 15:50:34 +0200 | |
commit | 1ed0948eea079a4c802d08cdb2e8db1eee0860f1 (patch) | |
tree | cf7d2861d1557a305b0c7786661b9e99c343d215 /kernel/trace/ftrace.c | |
parent | Merge branch 'for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu into core/rcu (diff) | |
parent | vmlinux.lds.h: Create section for protection against instrumentation (diff) | |
download | linux-dev-1ed0948eea079a4c802d08cdb2e8db1eee0860f1.tar.xz linux-dev-1ed0948eea079a4c802d08cdb2e8db1eee0860f1.zip |
Merge tag 'noinstr-lds-2020-05-19' into core/rcu
Get the noinstr section and annotation markers to base the RCU parts on.
Diffstat (limited to 'kernel/trace/ftrace.c')
-rw-r--r-- | kernel/trace/ftrace.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c index 771eace959f3..b5765aeea698 100644 --- a/kernel/trace/ftrace.c +++ b/kernel/trace/ftrace.c @@ -5154,6 +5154,7 @@ int unregister_ftrace_direct(unsigned long ip, unsigned long addr) list_del_rcu(&direct->next); synchronize_rcu_tasks(); kfree(direct); + kfree(entry); ftrace_direct_func_count--; } } |