Merge branch 'slab/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6 (f8e9766d) · Commits · e / devices / android_kernel_fairphone_FP4

mm/slab.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -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,