From 3c1cf80c575c3aad2b8970e9ce308a47742327e0 Mon Sep 17 00:00:00 2001 From: Xianzhong Date: Tue, 18 Jun 2013 02:45:07 +0800 Subject: ENGR00259411-3 fixed 073-base_cl6614_Add_a_gcdSUPPRESS_OOM_MESSAGE Add a gcdSUPPRESS_OOM_MESSAGE build option which can be used to enable an out-of-memory message in kernel. Signed-off-by: Loren Huang Fixed Conflicts: drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c Acked-by: Lily Zhang --- drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c b/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c index f586c1f06177..f6e7eafdc1f2 100644 --- a/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c +++ b/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c @@ -3886,7 +3886,7 @@ gckOS_AllocatePagedMemoryEx( if (mdl->u.contiguousPages == gcvNULL) { mdl->u.contiguousPages = - alloc_pages(GFP_KERNEL | __GFP_HIGHMEM, GetOrder(numPages)); + alloc_pages(GFP_KERNEL | __GFP_HIGHMEM | gcdNOWARN, GetOrder(numPages)); } } else -- cgit v1.2.3