From: Rebecca Schultz Zavin Date: Wed, 13 Oct 2010 00:03:02 +0000 (-0700) Subject: video: tegra: nvmap: Only allow allocations out of highmem X-Git-Tag: firefly_0821_release~9833^2~157^2~3 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=359cf685af035fb594835993da4e28a6c64307ba;p=firefly-linux-kernel-4.4.55.git video: tegra: nvmap: Only allow allocations out of highmem Low mem pages are allocated in larger super pages and their caching attributes can't be controlled on a per page basis. This patch forces nvmap to map out of highmem pages which are guaranteed to have page mappings. Change-Id: Id3921342ecceb0345d43365d4dd90b82ca8cfd11 Signed-off-by: Rebecca Schultz Zavin --- diff --git a/drivers/video/tegra/nvmap/nvmap_handle.c b/drivers/video/tegra/nvmap/nvmap_handle.c index eed3403db02d..21cbf9c4d85d 100644 --- a/drivers/video/tegra/nvmap/nvmap_handle.c +++ b/drivers/video/tegra/nvmap/nvmap_handle.c @@ -38,7 +38,7 @@ #include "nvmap_mru.h" #define NVMAP_SECURE_HEAPS (NVMAP_HEAP_CARVEOUT_IRAM | NVMAP_HEAP_IOVMM) -#define GFP_NVMAP (GFP_KERNEL | __GFP_HIGHMEM | __GFP_NOWARN) +#define GFP_NVMAP (__GFP_HIGHMEM | __GFP_NOWARN) /* handles may be arbitrarily large (16+MiB), and any handle allocated from * the kernel (i.e., not a carveout handle) includes its array of pages. to * preserve kmalloc space, if the array of pages exceeds PAGELIST_VMALLOC_MIN,