git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'rcu.next.v6.10' of https://github.com/urezki/linux
[sfrench/cifs-2.6.git]
/
kernel
/
trace
/
ftrace.c
diff --git
a/kernel/trace/ftrace.c
b/kernel/trace/ftrace.c
index da1710499698b0ed56ea89183d18befda56c0243..6c96b30f3d63b0a681de16deb50a6a96f6d0c61d 100644
(file)
--- a/
kernel/trace/ftrace.c
+++ b/
kernel/trace/ftrace.c
@@
-3157,8
+3157,7
@@
out:
* synchronize_rcu_tasks() will wait for those tasks to
* execute and either schedule voluntarily or enter user space.
*/
- if (IS_ENABLED(CONFIG_PREEMPTION))
- synchronize_rcu_tasks();
+ synchronize_rcu_tasks();
ftrace_trampoline_free(ops);
}