diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-01-28 09:30:11 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-01-28 09:30:11 +0100 |
| commit | 9a1f4150fe932fb892c05084029b3718b8ed1baf (patch) | |
| tree | b8f18ea5f0bdc842e3cf8da4700c1d577a3b1c66 /mm/mempolicy.c | |
| parent | f28442497b5caf7bf573ade22a7f8d3559e3ef56 (diff) | |
| parent | 1b1bc42c1692e9b62756323c675a44cb1a1f9dbd (diff) | |
| download | linux-9a1f4150fe932fb892c05084029b3718b8ed1baf.tar.gz linux-9a1f4150fe932fb892c05084029b3718b8ed1baf.tar.bz2 linux-9a1f4150fe932fb892c05084029b3718b8ed1baf.zip | |
Merge branch 'linus' into x86/boot, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'mm/mempolicy.c')
| -rw-r--r-- | mm/mempolicy.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/mempolicy.c b/mm/mempolicy.c index 2e346645eb80..1e7873e40c9a 100644 --- a/mm/mempolicy.c +++ b/mm/mempolicy.c @@ -2017,8 +2017,8 @@ retry_cpuset: nmask = policy_nodemask(gfp, pol); zl = policy_zonelist(gfp, pol, node); - mpol_cond_put(pol); page = __alloc_pages_nodemask(gfp, order, zl, nmask); + mpol_cond_put(pol); out: if (unlikely(!page && read_mems_allowed_retry(cpuset_mems_cookie))) goto retry_cpuset; |