summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMathieu Desnoyers <mathieu.desnoyers@polymtl.ca>2008-11-14 17:47:43 -0500
committerIngo Molnar <mingo@elte.hu>2008-11-16 09:01:32 +0100
commitda7b3eab167091693ad215ad7692f7d0d24d1356 (patch)
treea879fc523166fdaf196fe128e11246996eda0480
parentde0baf9ad661ac630a45a50ea1717cc4f4b33ace (diff)
downloadlinux-stable-da7b3eab167091693ad215ad7692f7d0d24d1356.tar.gz
linux-stable-da7b3eab167091693ad215ad7692f7d0d24d1356.tar.bz2
linux-stable-da7b3eab167091693ad215ad7692f7d0d24d1356.zip
tracepoints: use rcu_*_sched_notrace
Make sure tracepoints can be called within ftrace callbacks. Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca> Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r--include/linux/tracepoint.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/tracepoint.h b/include/linux/tracepoint.h
index 63064e9403f2..69648c54a326 100644
--- a/include/linux/tracepoint.h
+++ b/include/linux/tracepoint.h
@@ -40,14 +40,14 @@ struct tracepoint {
do { \
void **it_func; \
\
- rcu_read_lock_sched(); \
+ rcu_read_lock_sched_notrace(); \
it_func = rcu_dereference((tp)->funcs); \
if (it_func) { \
do { \
((void(*)(proto))(*it_func))(args); \
} while (*(++it_func)); \
} \
- rcu_read_unlock_sched(); \
+ rcu_read_unlock_sched_notrace(); \
} while (0)
/*