Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3e850509 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/rcu-doc-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/rcu-doc-2.6:
  Doc: Fix spelling in RCU/rculist_nulls.txt.
  Doc: Fix wrong API example usage of call_rcu().
  Doc: Fix missing whitespaces in RCU documentation.
parents a0e0404f edd4070f

Documentation/RCU/listRCU.txt

+3 −3
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ Following are the RCU equivalents for these two functions: 
		list_for_each_entry(e, list, list) {

			if (!audit_compare_rule(rule, &e->rule)) {

				list_del_rcu(&e->list);

				call_rcu(&e->rcu, audit_free_rule, e);

				call_rcu(&e->rcu, audit_free_rule);

				return 0;

			}

		}
@@ -206,7 +206,7 @@ RCU ("read-copy update") its name. The RCU code is as follows: 
				ne->rule.action = newaction;

				ne->rule.file_count = newfield_count;

				list_replace_rcu(e, ne);

				call_rcu(&e->rcu, audit_free_rule, e);

				call_rcu(&e->rcu, audit_free_rule);

				return 0;

			}

		}
@@ -283,7 +283,7 @@ flag under the spinlock as follows: 
				list_del_rcu(&e->list);

				e->deleted = 1;

				spin_unlock(&e->lock);

				call_rcu(&e->rcu, audit_free_rule, e);

				call_rcu(&e->rcu, audit_free_rule);

				return 0;

			}

		}

Documentation/RCU/rculist_nulls.txt

+2 −2
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ if (obj) { 
  /*

   * Because a writer could delete object, and a writer could

   * reuse these object before the RCU grace period, we

   * must check key after geting the reference on object

   * must check key after getting the reference on object

   */

  if (obj->key != key) { // not the object we expected

     put_ref(obj);
@@ -117,7 +117,7 @@ a race (some writer did a delete and/or a move of an object 
to another chain) checking the final 'nulls' value if

the lookup met the end of chain. If final 'nulls' value

is not the slot number, then we must restart the lookup at

the begining. If the object was moved to same chain,

the beginning. If the object was moved to the same chain,

then the reader doesnt care : It might eventually

scan the list again without harm.

Documentation/RCU/rcu.txt

+1 −1

File changed.

Contains only whitespace changes.