Merge "arm64: defconfig: Enable CMA performance optimizations on Lahaina"

This commit is contained in:
qctecmdr 2020-01-27 20:20:59 -08:00 • committed by Gerrit - the friendly Code Review server
commit bfab88fcd6
2 changed files with 10 additions and 1 deletions

View file

@ -38,6 +38,8 @@ CONFIG_QCOM_MEM_OFFLINE=y
CONFIG_OVERRIDE_MEMORY_LIMIT=y
CONFIG_VM_EVENT_COUNT_CLEAN_PAGE_RECLAIM=y
CONFIG_BALANCE_ANON_FILE_RECLAIM=y
CONFIG_CMA_DIRECT_UTILIZATION=y
CONFIG_CMA_PCP_LISTS=y
# CONFIG_ZONE_DEVICE is not set
# CONFIG_BUG_ON_HW_MEM_ONLINE_FAIL is not set
CONFIG_MSM_BT_POWER=m

View file

@ -455,7 +455,14 @@ static inline bool gfpflags_normal_context(const gfp_t gfp_flags)
static inline enum zone_type gfp_zone(gfp_t flags)
{
enum zone_type z;
int bit = (__force int) (flags & GFP_ZONEMASK);
int bit;
if (!IS_ENABLED(CONFIG_HIGHMEM)) {
if ((flags & __GFP_MOVABLE) && !(flags & __GFP_CMA))
flags &= ~__GFP_HIGHMEM;
}
bit = (__force int) (flags & GFP_ZONEMASK);
z = (GFP_ZONE_TABLE >> (bit * GFP_ZONES_SHIFT)) &
((1 << GFP_ZONES_SHIFT) - 1);