summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-08-09 12:51:25 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-08-09 12:51:25 -0700
commit47e180d6523081605c970f806572beab8a205537 (patch)
tree63e8fc833eb0650371c49dd6bd34806f05f80426
parente6a99d312687a42c077a9b8cb5e757f186edb1b9 (diff)
parent81107188f123e3c2217ac2f2feb2a1147904c62f (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: slub: Fix partial count comparison confusion
-rw-r--r--mm/slub.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/slub.c b/mm/slub.c
index 6da68597bde8..9f662d70eb47 100644
--- a/mm/slub.c
+++ b/mm/slub.c
@@ -1854,7 +1854,7 @@ redo:
new.frozen = 0;
- if (!new.inuse && n->nr_partial < s->min_partial)
+ if (!new.inuse && n->nr_partial > s->min_partial)
m = M_FREE;
else if (new.freelist) {
m = M_PARTIAL;