diff options
| author | Jordan Crouse <jcrouse@codeaurora.org> | 2016-02-25 09:16:25 -0700 |
|---|---|---|
| committer | David Keitel <dkeitel@codeaurora.org> | 2016-03-22 11:15:52 -0700 |
| commit | 56930b9f1730d6cdaf59da6000cfe0ca71f90f15 (patch) | |
| tree | 632046dee775a570ea6391474d6aba9492631104 /drivers/gpu/msm/kgsl_sharedmem.c | |
| parent | 318be96313dcf3828b02937e5aae38e9f862acf3 (diff) | |
msm: kgsl: Update various exernal APIs for the 4.4 kernel
Make several changes to build the GPU driver for 4.4:
- Rename CONFIG_MSM to CONFIG_QCOM where applicable
- Add msm_kgsl.h to the Kbuild exports
- Remove linux/coresight_of.h (as it has been merged into
coresight.h) and remove the .owner member of the
coresight_desc struct.
- Use the new location for the sync.h file (in staging)
- Remove an unused sync function
- Move oneshot_sync.h inside of #ifdef wrappers
Signed-off-by: Jordan Crouse <jcrouse@codeauorora.org>
Diffstat (limited to 'drivers/gpu/msm/kgsl_sharedmem.c')
| -rw-r--r-- | drivers/gpu/msm/kgsl_sharedmem.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/msm/kgsl_sharedmem.c b/drivers/gpu/msm/kgsl_sharedmem.c index 53dd3270c75b..9032035fe966 100644 --- a/drivers/gpu/msm/kgsl_sharedmem.c +++ b/drivers/gpu/msm/kgsl_sharedmem.c @@ -741,10 +741,10 @@ _kgsl_sharedmem_page_alloc(struct kgsl_memdesc *memdesc, * Don't do some of the more aggressive memory recovery * techniques for large order allocations */ - if (page_size != PAGE_SIZE) - gfp_mask |= __GFP_COMP | __GFP_NORETRY | - __GFP_NO_KSWAPD | __GFP_NOWARN; - else + if (page_size != PAGE_SIZE) { + gfp_mask |= __GFP_COMP | __GFP_NORETRY | __GFP_NOWARN; + gfp_mask &= ~__GFP_RECLAIM; + } else gfp_mask |= GFP_KERNEL; if (sharedmem_noretry_flag == true) |