git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'dt-for-linus' of git://git.secretlab.ca/git/linux
[sfrench/cifs-2.6.git]
/
mm
/
slub.c
diff --git
a/mm/slub.c
b/mm/slub.c
index f620bbf4054aa0c1cc771873a8fe3463856f2fcc..5e234f1f8853e952dceefe8c6b92201fcc3853d7 100644
(file)
--- a/
mm/slub.c
+++ b/
mm/slub.c
@@
-1352,11
+1352,12
@@
static struct page *allocate_slab(struct kmem_cache *s, gfp_t flags, int node)
page = alloc_slab_page(alloc_gfp, node, oo);
if (unlikely(!page)) {
oo = s->min;
page = alloc_slab_page(alloc_gfp, node, oo);
if (unlikely(!page)) {
oo = s->min;
+ alloc_gfp = flags;
/*
* Allocation may have failed due to fragmentation.
* Try a lower order alloc if possible
*/
/*
* Allocation may have failed due to fragmentation.
* Try a lower order alloc if possible
*/
- page = alloc_slab_page(
flags
, node, oo);
+ page = alloc_slab_page(
alloc_gfp
, node, oo);
if (page)
stat(s, ORDER_FALLBACK);
if (page)
stat(s, ORDER_FALLBACK);
@@
-1366,7
+1367,7
@@
static struct page *allocate_slab(struct kmem_cache *s, gfp_t flags, int node)
&& !(s->flags & (SLAB_NOTRACK | DEBUG_DEFAULT_FLAGS))) {
int pages = 1 << oo_order(oo);
&& !(s->flags & (SLAB_NOTRACK | DEBUG_DEFAULT_FLAGS))) {
int pages = 1 << oo_order(oo);
- kmemcheck_alloc_shadow(page, oo_order(oo),
flags
, node);
+ kmemcheck_alloc_shadow(page, oo_order(oo),
alloc_gfp
, node);
/*
* Objects from caches that have a constructor don't get
/*
* Objects from caches that have a constructor don't get