2009-12-28 19:05:35

by Pekka Enberg

[permalink] [raw]
Subject: [GIT PULL] SLAB updates for 2.6.33-rc2

Hi Linus,

Here's a fix for SLAB lockdep annotation breakage that's causing false
positives in 2.6.33-rc2.

Pekka

The following changes since commit 6b7b284958d47b77d06745b36bc7f36dab769d9b:
Linus Torvalds (1):
Linux 2.6.33-rc2

are available in the git repository at:

ssh://master.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6 slab/urgent

Pekka Enberg (1):
SLAB: Fix lockdep annotation breakage

mm/slab.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/mm/slab.c b/mm/slab.c
index 7d41f15..7451bda 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,