diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-28 12:17:40 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-28 12:17:40 -0700 |
| commit | e6cb6281ef8547fea1243b1c2a4e0f08d9b86ae1 (patch) | |
| tree | 4444be8141566dec3c88ff5fa7354cbe4cebccdc /lib | |
| parent | ab8aadbda7d59d4674ef614cba2a67c50667a6af (diff) | |
| parent | 8695159967957015f8dfb49315d6f88e111d90e0 (diff) | |
| download | linux-rt-e6cb6281ef8547fea1243b1c2a4e0f08d9b86ae1.tar.gz | |
Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
sched: silence PROVE_RCU in sched_fork()
idr: fix RCU lockdep splat in idr_get_next()
rcu: apply RCU protection to wake_affine()
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/idr.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/idr.c b/lib/idr.c index c1a206901761..7f1a4f0acf50 100644 --- a/lib/idr.c +++ b/lib/idr.c @@ -602,7 +602,7 @@ void *idr_get_next(struct idr *idp, int *nextidp) /* find first ent */ n = idp->layers * IDR_BITS; max = 1 << n; - p = rcu_dereference(idp->top); + p = rcu_dereference_raw(idp->top); if (!p) return NULL; @@ -610,7 +610,7 @@ void *idr_get_next(struct idr *idp, int *nextidp) while (n > 0 && p) { n -= IDR_BITS; *paa++ = p; - p = rcu_dereference(p->ary[(id >> n) & IDR_MASK]); + p = rcu_dereference_raw(p->ary[(id >> n) & IDR_MASK]); } if (p) { |