projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mm: slub: call account_slab_page() after slab page initialization
[linux-2.6-microblaze.git]
/
mm
/
slub.c
diff --git
a/mm/slub.c
b/mm/slub.c
index
0c8b43a
..
dc5b42e
100644
(file)
--- a/
mm/slub.c
+++ b/
mm/slub.c
@@
-1619,9
+1619,6
@@
static inline struct page *alloc_slab_page(struct kmem_cache *s,
else
page = __alloc_pages_node(node, flags, order);
else
page = __alloc_pages_node(node, flags, order);
- if (page)
- account_slab_page(page, order, s);
-
return page;
}
return page;
}
@@
-1774,6
+1771,8
@@
static struct page *allocate_slab(struct kmem_cache *s, gfp_t flags, int node)
page->objects = oo_objects(oo);
page->objects = oo_objects(oo);
+ account_slab_page(page, oo_order(oo), s);
+
page->slab_cache = s;
__SetPageSlab(page);
if (page_is_pfmemalloc(page))
page->slab_cache = s;
__SetPageSlab(page);
if (page_is_pfmemalloc(page))