diff --git a/[refs] b/[refs] index add1edd2d525..0a56c25021df 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e3818b8dce2a934cd1521dbc4827e5238d8f45d8 +refs/heads/master: 7f5b774275df8c76a959eae7488128b637fcbfc8 diff --git a/trunk/include/linux/tracepoint.h b/trunk/include/linux/tracepoint.h index f59604ed0ec6..78b4bd3be496 100644 --- a/trunk/include/linux/tracepoint.h +++ b/trunk/include/linux/tracepoint.h @@ -49,7 +49,7 @@ struct tracepoint { void **it_func; \ \ rcu_read_lock_sched_notrace(); \ - it_func = rcu_dereference((tp)->funcs); \ + it_func = rcu_dereference_sched((tp)->funcs); \ if (it_func) { \ do { \ ((void(*)(proto))(*it_func))(args); \