diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-02-15 16:07:18 -0800 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-02-15 16:07:18 -0800 |
| commit | 97ae2b5c17d6cc988c6d49ae0cf95befb6b7081c (patch) | |
| tree | a71115af6c30fdc9de0878e2cf1c51e95b17a324 /include/linux/tracepoint.h | |
| parent | ef47fa5280819deaa8da7e0db1d875b225de5838 (diff) | |
| parent | c8af781ebf3ffe37c18c34ca89e29c085560e561 (diff) | |
| download | op-kernel-dev-97ae2b5c17d6cc988c6d49ae0cf95befb6b7081c.zip op-kernel-dev-97ae2b5c17d6cc988c6d49ae0cf95befb6b7081c.tar.gz | |
Merge branch 'bfin_rotary' into next
Merge bfin_rotary driver changes from Sonic Zhang.
Diffstat (limited to 'include/linux/tracepoint.h')
| -rw-r--r-- | include/linux/tracepoint.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/tracepoint.h b/include/linux/tracepoint.h index e08e21e..c728513 100644 --- a/include/linux/tracepoint.h +++ b/include/linux/tracepoint.h @@ -173,7 +173,7 @@ extern void syscall_unregfunc(void); TP_PROTO(data_proto), \ TP_ARGS(data_args), \ TP_CONDITION(cond),,); \ - if (IS_ENABLED(CONFIG_LOCKDEP)) { \ + if (IS_ENABLED(CONFIG_LOCKDEP) && (cond)) { \ rcu_read_lock_sched_notrace(); \ rcu_dereference_sched(__tracepoint_##name.funcs);\ rcu_read_unlock_sched_notrace(); \ |
