diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-30 22:14:25 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-30 22:14:25 +0100 |
| commit | f8e9766dd1bacd5f32f9ac4322b55fbfd46b778e (patch) | |
| tree | f6b5ff90350cf7f8d803c3b25d4b2b174b3e17f0 /mm | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jba... (diff) | |
| parent | SLAB: Fix lockdep annotation breakage (diff) | |
| download | linux-f8e9766dd1bacd5f32f9ac4322b55fbfd46b778e.tar.xz linux-f8e9766dd1bacd5f32f9ac4322b55fbfd46b778e.zip | |
Merge branch 'slab/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6
* 'slab/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6:
SLAB: Fix lockdep annotation breakage
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/slab.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mm/slab.c b/mm/slab.c index 7d41f15b48d3..7451bdacaf18 100644 --- a/mm/slab.c +++ b/mm/slab.c @@ -654,7 +654,7 @@ static void init_node_lock_keys(int q) l3 = s->cs_cachep->nodelists[q]; if (!l3 || OFF_SLAB(s->cs_cachep)) - return; + continue; lockdep_set_class(&l3->list_lock, &on_slab_l3_key); alc = l3->alien; /* @@ -665,7 +665,7 @@ static void init_node_lock_keys(int q) * for alloc_alien_cache, */ if (!alc || (unsigned long)alc == BAD_ALIEN_MAGIC) - return; + continue; for_each_node(r) { if (alc[r]) lockdep_set_class(&alc[r]->lock, |