Piteball
/
android_kernel_samsung_msm8976
mirror of https://github.com/team-infusion-developers/android_kernel_samsung_msm8976.git
1
1
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "cma: fix alignment to PMD_SIZE for fixup region"

This commit is contained in:
Linux Build Service Account 2015-06-20 04:08:26 -07:00 committed by Gerrit - the friendly Code Review server
parent a33e94cb15 819c8636fc
commit e59c237bc1
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/base/dma-contiguous.c
View File

@ -297,12 +297,14 @@ int __init cma_fdt_scan(unsigned long node, const char *uname,
remove =
of_get_flat_dt_prop(node, "linux,remove-completely", NULL) ? 1 : 0;
/* fixup demands base and size to be section aligned, if it doesn't
/* fixup demands base and size to be PMD_SIZE aligned, if it doesn't
* then reduce fixup to remove
*/
if (fixup) {
if (!IS_ALIGNED(base, SECTION_SIZE) ||
!IS_ALIGNED(size, SECTION_SIZE)) {
if (!IS_ALIGNED(base, PMD_SIZE) ||
!IS_ALIGNED(size, PMD_SIZE)) {
pr_info("fixup: fallback to remove region as base=%pa or size=%pa not aligned\n",
&base, &size);
fixup = 0;
remove = 1;
}
@ -456,7 +458,7 @@ int __init dma_contiguous_reserve_area(phys_addr_t size, phys_addr_t *res_base,
/* Sanitise input arguments */
if (fixup)
alignment = SECTION_SIZE;
alignment = PMD_SIZE;
else if (!remove)
alignment = PAGE_SIZE << max(MAX_ORDER - 1, pageblock_order);