diff options
| author | Xianzhong <b07117@freescale.com> | 2013-06-18 02:45:07 +0800 |
|---|---|---|
| committer | Xianzhong <b07117@freescale.com> | 2013-06-18 02:47:27 +0800 |
| commit | 3c1cf80c575c3aad2b8970e9ce308a47742327e0 (patch) | |
| tree | 4c3dd48fe5114ba534cd7c969495b2c9dcf6f8f5 | |
| parent | eb515e2ba693bd186d362056a740aba4333eb068 (diff) | |
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 <b02279@freescale.com>
Fixed Conflicts:
drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c
Acked-by: Lily Zhang
| -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 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 |