diff options
| author | Mark Brown <broonie@linaro.org> | 2013-06-14 10:16:06 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-06-14 10:16:06 +0100 |
| commit | 384b8345589cbbb18a99ce1b112da90c58c802e8 (patch) | |
| tree | 51fee39fa19adad6b24fb90123e7a0ca3159c9c5 /include/linux/rcupdate.h | |
| parent | 9c24b1672283644adf871244771ebf387dd73f90 (diff) | |
| parent | 2e7ee15ced914e109a1a5b6dfcd463d846a13bd5 (diff) | |
Merge branch 'fix/wm8962' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-wm8962
Conflicts:
sound/soc/codecs/wm8962.c
Diffstat (limited to 'include/linux/rcupdate.h')
| -rw-r--r-- | include/linux/rcupdate.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/include/linux/rcupdate.h b/include/linux/rcupdate.h index 4ccd68e49b0..ddcc7826d90 100644 --- a/include/linux/rcupdate.h +++ b/include/linux/rcupdate.h @@ -640,6 +640,15 @@ static inline void rcu_preempt_sleep_check(void) #define rcu_dereference_raw(p) rcu_dereference_check(p, 1) /*@@@ needed? @@@*/ +/* + * The tracing infrastructure traces RCU (we want that), but unfortunately + * some of the RCU checks causes tracing to lock up the system. + * + * The tracing version of rcu_dereference_raw() must not call + * rcu_read_lock_held(). + */ +#define rcu_dereference_raw_notrace(p) __rcu_dereference_check((p), 1, __rcu) + /** * rcu_access_index() - fetch RCU index with no dereferencing * @p: The index to read |