| commit | e3a61d47cc37c51834abe537e0ed685829d56ee2 | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Sun Mar 21 18:03:11 2010 -0700 |
| committer | David S. Miller <davem@davemloft.net> | Sun Mar 21 18:03:11 2010 -0700 |
| tree | 0d44d0916200cc49344c41db59fef568711f17b1 | |
| parent | 634a4b2038a6eba4c211fb906fa2f6ec9a4bbfc7 [diff] | |
| parent | c2c77ec83bdad17fb688557b5b3fdc36661dd1c6 [diff] |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-2.6
diff --git a/net/ipv4/fib_trie.c b/net/ipv4/fib_trie.c index af5d897..01ef8ba 100644 --- a/net/ipv4/fib_trie.c +++ b/net/ipv4/fib_trie.c
@@ -961,7 +961,9 @@ struct node *n; pos = 0; - n = rcu_dereference(t->trie); + n = rcu_dereference_check(t->trie, + rcu_read_lock_held() || + lockdep_rtnl_is_held()); while (n != NULL && NODE_TYPE(n) == T_TNODE) { tn = (struct tnode *) n;