diff options
| author | John Stultz <john.stultz@linaro.org> | 2013-04-08 10:45:54 -0700 |
|---|---|---|
| committer | John Stultz <john.stultz@linaro.org> | 2013-04-08 10:45:54 -0700 |
| commit | 698cb5d58f5498273e71d4797c8b3353535c8de6 (patch) | |
| tree | 20f459c3e673a04c82ba2d529fc14efd28c1dcb5 /kernel/trace/ftrace.c | |
| parent | 97c64b5e2132e104a8c25026319b239fce7463f4 (diff) | |
| parent | 31880c37c11e28cb81c70757e38392b42e695dc6 (diff) | |
Merge remote-tracking branch 'linus/master' into linaro-android-3.9-experimentaltracking-linaro-android-3.9-llct-20130408.0
Update to 3.9-rc6
Conflicts:
arch/arm/mm/cache-l2x0.c
drivers/hid/hid-magicmouse.c
Diffstat (limited to 'kernel/trace/ftrace.c')
| -rw-r--r-- | kernel/trace/ftrace.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c index ab25b88aae56..6893d5a2bf08 100644 --- a/kernel/trace/ftrace.c +++ b/kernel/trace/ftrace.c @@ -3104,8 +3104,8 @@ __unregister_ftrace_function_probe(char *glob, struct ftrace_probe_ops *ops, continue; } - hlist_del(&entry->node); - call_rcu(&entry->rcu, ftrace_free_entry_rcu); + hlist_del_rcu(&entry->node); + call_rcu_sched(&entry->rcu, ftrace_free_entry_rcu); } } __disable_ftrace_function_probe(); |