evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "memshare: Perform Hypervisor mapping for boot-time allotted memory"

Browse source
This commit is contained in:
Linux Build Service Account 2017-06-18 09:47:25 -07:00 • committed by Gerrit - the friendly Code Review server
commit a94129212a
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
drivers/soc/qcom/memshare/msm_memshare.c
View file

@ -968,8 +968,8 @@ static int memshare_child_probe(struct platform_device *pdev)
/*
* Memshare allocation for guaranteed clients
*/
if (memblock[num_clients].guarantee) {
if (client_id == 1 && size > 0)
if (memblock[num_clients].guarantee && size > 0) {
if (client_id == 1)
size += MEMSHARE_GUARD_BYTES;
rc = memshare_alloc(memsh_child->dev,
size,
@ -980,6 +980,7 @@ static int memshare_child_probe(struct platform_device *pdev)
return rc;
}
memblock[num_clients].alloted = 1;
shared_hyp_mapping(num_clients);
}
/*