evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'tip/perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace into perf/urgent

Browse source
This commit is contained in:
Ingo Molnar 2011-12-05 14:34:00 +01:00
commit dc440d10e1
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
kernel/trace/trace_events_filter.c
View file

@ -1686,7 +1686,7 @@ static int replace_system_preds(struct event_subsystem *system,
* replace the filter for the call. * replace the filter for the call.
*/ */
filter = call->filter; filter = call->filter;
call->filter = filter_item->filter; rcu_assign_pointer(call->filter, filter_item->filter);
filter_item->filter = filter; filter_item->filter = filter;
fail = false; fail = false;
@ -1741,7 +1741,7 @@ int apply_event_filter(struct ftrace_event_call *call, char *filter_string)
filter = call->filter; filter = call->filter;
if (!filter) if (!filter)
goto out_unlock; goto out_unlock;
call->filter = NULL; RCU_INIT_POINTER(call->filter, NULL);
/* Make sure the filter is not being used */ /* Make sure the filter is not being used */
synchronize_sched(); synchronize_sched();
__free_filter(filter); __free_filter(filter);
@ -1782,7 +1782,7 @@ out:
* string * string
*/ */
tmp = call->filter; tmp = call->filter;
call->filter = filter; rcu_assign_pointer(call->filter, filter);
if (tmp) { if (tmp) {
/* Make sure the call is done with the filter */ /* Make sure the call is done with the filter */
synchronize_sched(); synchronize_sched();