diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-30 16:14:25 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-30 16:14:25 -0500 |
| commit | f8e9766dd1bacd5f32f9ac4322b55fbfd46b778e (patch) | |
| tree | f6b5ff90350cf7f8d803c3b25d4b2b174b3e17f0 /mm | |
| parent | d661d76b0262f3ed649a1dea24c0119757592b09 (diff) | |
| parent | 00afa758067ac1c947149ef766adcdfe30c44d7d (diff) | |
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
| @@ -654,7 +654,7 @@ static void init_node_lock_keys(int q) | |||
| 654 | 654 | ||
| 655 | l3 = s->cs_cachep->nodelists[q]; | 655 | l3 = s->cs_cachep->nodelists[q]; |
| 656 | if (!l3 || OFF_SLAB(s->cs_cachep)) | 656 | if (!l3 || OFF_SLAB(s->cs_cachep)) |
| 657 | return; | 657 | continue; |
| 658 | lockdep_set_class(&l3->list_lock, &on_slab_l3_key); | 658 | lockdep_set_class(&l3->list_lock, &on_slab_l3_key); |
| 659 | alc = l3->alien; | 659 | alc = l3->alien; |
| 660 | /* | 660 | /* |
| @@ -665,7 +665,7 @@ static void init_node_lock_keys(int q) | |||
| 665 | * for alloc_alien_cache, | 665 | * for alloc_alien_cache, |
| 666 | */ | 666 | */ |
| 667 | if (!alc || (unsigned long)alc == BAD_ALIEN_MAGIC) | 667 | if (!alc || (unsigned long)alc == BAD_ALIEN_MAGIC) |
| 668 | return; | 668 | continue; |
| 669 | for_each_node(r) { | 669 | for_each_node(r) { |
| 670 | if (alc[r]) | 670 | if (alc[r]) |
| 671 | lockdep_set_class(&alc[r]->lock, | 671 | lockdep_set_class(&alc[r]->lock, |