projects
/
platform
/
adaptation
/
renesas_rcar
/
renesas_kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mm, migration: add destination page freeing callback
[platform/adaptation/renesas_rcar/renesas_kernel.git]
/
mm
/
slab.c
diff --git
a/mm/slab.c
b/mm/slab.c
index
ea854eb
..
0b1c2a5
100644
(file)
--- a/
mm/slab.c
+++ b/
mm/slab.c
@@
-3122,7
+3122,7
@@
static void *fallback_alloc(struct kmem_cache *cache, gfp_t flags)
local_flags = flags & (GFP_CONSTRAINT_MASK|GFP_RECLAIM_MASK);
retry_cpuset:
local_flags = flags & (GFP_CONSTRAINT_MASK|GFP_RECLAIM_MASK);
retry_cpuset:
- cpuset_mems_cookie =
get_mems_allowed
();
+ cpuset_mems_cookie =
read_mems_allowed_begin
();
zonelist = node_zonelist(slab_node(), flags);
retry:
zonelist = node_zonelist(slab_node(), flags);
retry:
@@
-3180,7
+3180,7
@@
retry:
}
}
}
}
- if (unlikely(!
put_mems_allowed(cpuset_mems_cookie) && !obj
))
+ if (unlikely(!
obj && read_mems_allowed_retry(cpuset_mems_cookie)
))
goto retry_cpuset;
return obj;
}
goto retry_cpuset;
return obj;
}