summaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-07-17 08:43:12 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-07-17 08:43:12 -0700
commit5bb93f1a212e756834bc380682210647b5cdfcf1 (patch)
treee9628306c2158dc0a62d636e4c7ba981df0978ca /mm
parente5254a625d1d3f3119d80ddc30a6e6fe64001231 (diff)
parent46c87852e99cf8ce97e207b11cde19085837e39c (diff)
downloadop-kernel-dev-5bb93f1a212e756834bc380682210647b5cdfcf1.zip
op-kernel-dev-5bb93f1a212e756834bc380682210647b5cdfcf1.tar.gz
Merge branch 'fixes-for-linus' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping
Pull CMA and DMA-mapping fixes from Marek Szyprowski: "Another set of minor fixups for recently merged Contiguous Memory Allocator and ARM DMA-mapping changes. Those patches fix mysterious crashes on systems with CMA and Himem enabled as well as some corner cases caused by typical off-by-one bug." * 'fixes-for-linus' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping: ARM: dma-mapping: modify condition check while freeing pages mm: cma: fix condition check when setting global cma area mm: cma: don't replace lowmem pages with highmem
Diffstat (limited to 'mm')
-rw-r--r--mm/page_alloc.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 4403009..4a4f921 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -5635,7 +5635,12 @@ static struct page *
__alloc_contig_migrate_alloc(struct page *page, unsigned long private,
int **resultp)
{
- return alloc_page(GFP_HIGHUSER_MOVABLE);
+ gfp_t gfp_mask = GFP_USER | __GFP_MOVABLE;
+
+ if (PageHighMem(page))
+ gfp_mask |= __GFP_HIGHMEM;
+
+ return alloc_page(gfp_mask);
}
/* [start, end) must belong to a single zone. */
OpenPOWER on IntegriCloud