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 <rebecca@android.com>

diff --git a/drivers/video/tegra/nvmap/nvmap_handle.c b/drivers/video/tegra/nvmap/nvmap_handle.c
index eed3403db02dff5a00aefcf356954ff675eb4328..21cbf9c4d85dfab5d6dc63e780885ebc6e119481 100644 (file)
--- 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,