The commit is pushed to "branch-rh7-3.10.0-123.1.2-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git after rh7-3.10.0-123.1.2.vz7.4.10 ------> commit 5425b7be953d98968a1b23e613ca45210a6cc6ca Author: Kir Kolyshkin <k...@openvz.org> Date: Thu May 7 20:28:14 2015 +0400
bc/mm/shmem.c: use mm_ub() macro to avoid compilation errors if !CONFIG_BEANCOUNTERS This was found while tring to compile the kernel with a stock config (i.e. no CONFIG_BEANCOUNTERS, CONFIG_VE etc.) and boot it on IBM Power8. ============================================================= Use mm_ub() macro to avoid this: mm/shmem.c: In function âtmpfs_ram_pagesâ: mm/shmem.c:122:18: error: âstruct mm_structâ has no member named âmm_ubâ ub = current->mm->mm_ub; ^ mm/shmem.c: In function âshmem_zero_setupâ: mm/shmem.c:3013:39: error: âstruct mm_structâ has no member named âmm_ubâ uncharge_beancounter_fast(vma->vm_mm->mm_ub, UB_PRIVVMPAGES, Signed-off-by: Kir Kolyshkin <k...@openvz.org> --- mm/shmem.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mm/shmem.c b/mm/shmem.c index c01b3a2..a6b3e30 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -119,7 +119,7 @@ static unsigned long tmpfs_ram_pages(void) if (unlikely(!current->mm)) goto out; - ub = current->mm->mm_ub; + ub = mm_ub(current->mm); if (ub != get_ub0()) { ub_rampages = ub->ub_parms[UB_PHYSPAGES].limit; if (ub_rampages == UB_MAXVALUE) @@ -3010,7 +3010,7 @@ int shmem_zero_setup(struct vm_area_struct *vma) if (vma->vm_file) fput(vma->vm_file); else if (vma->vm_flags & VM_WRITE) - uncharge_beancounter_fast(vma->vm_mm->mm_ub, UB_PRIVVMPAGES, + uncharge_beancounter_fast(mm_ub(vma->vm_mm), UB_PRIVVMPAGES, size >> PAGE_SHIFT); vma->vm_file = file; vma->vm_ops = &shmem_vm_ops;
_______________________________________________ Devel mailing list Devel@openvz.org https://lists.openvz.org/mailman/listinfo/devel