diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-16 11:10:07 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-16 11:10:07 -0400 |
| commit | 016aa2ed1cc9cf704cf76d8df07751b6daa9750f (patch) | |
| tree | bebfea796fbcaed6995f41cb4ab1333a0e09a1ff /kernel/rcutiny_plugin.h | |
| parent | 34d211a2d5df4984a35b18d8ccacbe1d10abb067 (diff) | |
| parent | 241e6663b5151733294d1a230a3fd8a4d32e187f (diff) | |
Merge branch 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
smp: Document transitivity for memory barriers.
rcu: add comment saying why DEBUG_OBJECTS_RCU_HEAD depends on PREEMPT.
rcupdate: remove dead code
rcu: add documentation saying which RCU flavor to choose
rcutorture: Get rid of duplicate sched.h include
rcu: call __rcu_read_unlock() in exit_rcu for tiny RCU
Diffstat (limited to 'kernel/rcutiny_plugin.h')
| -rw-r--r-- | kernel/rcutiny_plugin.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/rcutiny_plugin.h b/kernel/rcutiny_plugin.h index 015abaea962a..3cb8e362e883 100644 --- a/kernel/rcutiny_plugin.h +++ b/kernel/rcutiny_plugin.h | |||
| @@ -852,7 +852,7 @@ void exit_rcu(void) | |||
| 852 | if (t->rcu_read_lock_nesting == 0) | 852 | if (t->rcu_read_lock_nesting == 0) |
| 853 | return; | 853 | return; |
| 854 | t->rcu_read_lock_nesting = 1; | 854 | t->rcu_read_lock_nesting = 1; |
| 855 | rcu_read_unlock(); | 855 | __rcu_read_unlock(); |
| 856 | } | 856 | } |
| 857 | 857 | ||
| 858 | #else /* #ifdef CONFIG_TINY_PREEMPT_RCU */ | 858 | #else /* #ifdef CONFIG_TINY_PREEMPT_RCU */ |