From 4531ec56c17ff89a39a51907ab38209e26398da0 Mon Sep 17 00:00:00 2001 From: Xianzhong Date: Mon, 12 Nov 2012 23:33:28 +0800 Subject: ENGR00233049 Fixed kernel panic in lower memory killer The kernel panic happen when normal memory is exhausted but high memory is available, The fix is to disable oom-killer in normal alloc_pages, oom-killer will be triggered when normal and highmem zones are exhausted. Signed-off-by: Xianzhong 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 3865b6720612..c56a42e60f2b 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 @@ -4033,7 +4033,7 @@ gckOS_AllocatePagedMemoryEx( /* Get contiguous pages, and suppress warning (stack dump) from kernel when we run out of memory. */ mdl->u.contiguousPages = - alloc_pages(GFP_KERNEL | __GFP_NOWARN, GetOrder(numPages)); + alloc_pages(GFP_KERNEL | __GFP_NORETRY | __GFP_NOWARN, GetOrder(numPages)); if (mdl->u.contiguousPages == gcvNULL) { -- cgit v1.2.3