diff options
| author | Xianzhong <b07117@freescale.com> | 2012-11-12 23:33:28 +0800 |
|---|---|---|
| committer | Xianzhong <b07117@freescale.com> | 2012-11-12 23:44:35 +0800 |
| commit | 4531ec56c17ff89a39a51907ab38209e26398da0 (patch) | |
| tree | 5b3985d54e5682a724c43e5c20009ff8521bb767 /drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c | |
| parent | 4429a55b3cd51291ffc4c4ee59b9acf18398978e (diff) | |
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 <b07117@freescale.com>
Acked-by: Lily Zhang
Diffstat (limited to 'drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c')
| -rw-r--r-- | drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c | 2 |
1 files changed, 1 insertions, 1 deletions
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) { |