diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-08-23 11:32:34 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-08-23 11:32:34 +0200 |
| commit | a6b9b4d50f492630443b38404d1f436b3b748c14 (patch) | |
| tree | f3512389c42cecfae50b6a315ec6ab1fa470e30d /Documentation/DocBook | |
| parent | e36c886a0f9d624377977fa6cae309cfd7f362fa (diff) | |
| parent | 28457ee69c473a903e51e26c7bcd6f1e9eceb93e (diff) | |
| download | linux-stable-a6b9b4d50f492630443b38404d1f436b3b748c14.tar.gz linux-stable-a6b9b4d50f492630443b38404d1f436b3b748c14.tar.bz2 linux-stable-a6b9b4d50f492630443b38404d1f436b3b748c14.zip | |
Merge branch 'rcu/next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-2.6-rcu into core/rcu
Diffstat (limited to 'Documentation/DocBook')
| -rw-r--r-- | Documentation/DocBook/kernel-locking.tmpl | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/Documentation/DocBook/kernel-locking.tmpl b/Documentation/DocBook/kernel-locking.tmpl index 0b1a3f97f285..d7884b13fb11 100644 --- a/Documentation/DocBook/kernel-locking.tmpl +++ b/Documentation/DocBook/kernel-locking.tmpl @@ -1645,7 +1645,9 @@ the amount of locking which needs to be done. all the readers who were traversing the list when we deleted the element are finished. We use <function>call_rcu()</function> to register a callback which will actually destroy the object once - the readers are finished. + all pre-existing readers are finished. Alternatively, + <function>synchronize_rcu()</function> may be used to block until + all pre-existing are finished. </para> <para> But how does Read Copy Update know when the readers are @@ -1714,7 +1716,7 @@ the amount of locking which needs to be done. - object_put(obj); + list_del_rcu(&obj->list); cache_num--; -+ call_rcu(&obj->rcu, cache_delete_rcu, obj); ++ call_rcu(&obj->rcu, cache_delete_rcu); } /* Must be holding cache_lock */ @@ -1725,14 +1727,6 @@ the amount of locking which needs to be done. if (++cache_num > MAX_CACHE_SIZE) { struct object *i, *outcast = NULL; list_for_each_entry(i, &cache, list) { -@@ -85,6 +94,7 @@ - obj->popularity = 0; - atomic_set(&obj->refcnt, 1); /* The cache holds a reference */ - spin_lock_init(&obj->lock); -+ INIT_RCU_HEAD(&obj->rcu); - - spin_lock_irqsave(&cache_lock, flags); - __cache_add(obj); @@ -104,12 +114,11 @@ struct object *cache_find(int id) { |