Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 310131
b: refs/heads/master
c: 02d7633
h: refs/heads/master
i:
  310129: cc6d553
  310127: 8d3cc57
v: v3
  • Loading branch information
Joonsoo Kim authored and Pekka Enberg committed May 18, 2012
1 parent 445dfaa commit 2a65060
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 4053497d6a37715f4b20dcc180a52717b4c8ffba
refs/heads/master: 02d7633fa567be7bf55a993b79d2a31b95ce2227
9 changes: 6 additions & 3 deletions trunk/mm/slub.c
Original file line number Diff line number Diff line change
Expand Up @@ -1514,15 +1514,19 @@ static inline void *acquire_slab(struct kmem_cache *s,
freelist = page->freelist;
counters = page->counters;
new.counters = counters;
if (mode)
if (mode) {
new.inuse = page->objects;
new.freelist = NULL;
} else {
new.freelist = freelist;
}

VM_BUG_ON(new.frozen);
new.frozen = 1;

} while (!__cmpxchg_double_slab(s, page,
freelist, counters,
NULL, new.counters,
new.freelist, new.counters,
"lock and freeze"));

remove_partial(n, page);
Expand Down Expand Up @@ -1564,7 +1568,6 @@ static void *get_partial_node(struct kmem_cache *s,
object = t;
available = page->objects - page->inuse;
} else {
page->freelist = t;
available = put_cpu_partial(s, page, 0);
stat(s, CPU_PARTIAL_NODE);
}
Expand Down

0 comments on commit 2a65060

Please sign in to comment.