diff options
| author | Mark Brown <broonie@kernel.org> | 2015-03-11 12:53:25 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-03-11 12:53:25 +0000 |
| commit | 11dd60447e3b1018f9cae66737cb902b519d3454 (patch) | |
| tree | a33d8bcb18a3becae2161aa215c25d5674626c57 /mm/nommu.c | |
| parent | 8d0c38a3f2a6bb70e952f127ed817fc7a08db52c (diff) | |
| parent | 9eccca0843205f87c00404b663188b88eb248051 (diff) | |
| download | lwn-11dd60447e3b1018f9cae66737cb902b519d3454.tar.gz lwn-11dd60447e3b1018f9cae66737cb902b519d3454.zip | |
Merge tag 'v4.0-rc3' into asoc-intel
Linux 4.0-rc3
Diffstat (limited to 'mm/nommu.c')
| -rw-r--r-- | mm/nommu.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/mm/nommu.c b/mm/nommu.c index 7296360fc057..3e67e7538ecf 100644 --- a/mm/nommu.c +++ b/mm/nommu.c @@ -1213,11 +1213,9 @@ static int do_mmap_private(struct vm_area_struct *vma, if (sysctl_nr_trim_pages && total - point >= sysctl_nr_trim_pages) { total = point; kdebug("try to alloc exact %lu pages", total); - base = alloc_pages_exact(len, GFP_KERNEL); - } else { - base = (void *)__get_free_pages(GFP_KERNEL, order); } + base = alloc_pages_exact(total << PAGE_SHIFT, GFP_KERNEL); if (!base) goto enomem; |