[Devel] [PATCH RHEL7 COMMIT] bc/mm/{memory.c, mprotect.c}: use mm_ub() macro

[Konstantin Khorenko]

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 38f2eb7684e989f7cc57f8c6b6b612ddaf7d884e
Author: Kir Kolyshkin <kir at openvz.org>
Date:   Thu May 7 20:28:12 2015 +0400

    bc/mm/{memory.c,mprotect.c}: use mm_ub() macro
    
    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.
    
    =============================================================
    
    Fix !CONFIG_BEANCOUNTERS compilation
    
    Signed-off-by: Kir Kolyshkin <kir at openvz.org>
---
 mm/memory.c   | 2 +-
 mm/mprotect.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/mm/memory.c b/mm/memory.c
index 7961198..5ec71da 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -3193,7 +3193,7 @@ static int do_swap_page(struct mm_struct *mm, struct vm_area_struct *vma,
 	mem_cgroup_commit_charge_swapin(page, ptr);
 
 	swap_free(entry);
-	if (vm_swap_full() || ub_swap_full(mm->mm_ub) ||
+	if (vm_swap_full() || ub_swap_full(mm_ub(mm)) ||
 			(vma->vm_flags & VM_LOCKED) || PageMlocked(page))
 		try_to_free_swap(page);
 	unlock_page(page);
diff --git a/mm/mprotect.c b/mm/mprotect.c
index d976ae6..b55899d 100644
--- a/mm/mprotect.c
+++ b/mm/mprotect.c
@@ -282,7 +282,7 @@ mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
 	error = -ENOMEM;
 	if (!VM_UB_PRIVATE(oldflags, vma->vm_file) &&
 	    VM_UB_PRIVATE(newflags, vma->vm_file) &&
-	    charge_beancounter_fast(mm->mm_ub, UB_PRIVVMPAGES, nrpages, UB_SOFT))
+	    charge_beancounter_fast(mm_ub(mm), UB_PRIVVMPAGES, nrpages, UB_SOFT))
 		goto fail_ch;
 
 	/*
@@ -348,7 +348,7 @@ success:
 
 	if (VM_UB_PRIVATE(oldflags, vma->vm_file) &&
 	    !VM_UB_PRIVATE(newflags, vma->vm_file))
-		uncharge_beancounter_fast(mm->mm_ub, UB_PRIVVMPAGES, nrpages);
+		uncharge_beancounter_fast(mm_ub(mm), UB_PRIVVMPAGES, nrpages);
 
 	perf_event_mmap(vma);
 	return 0;
@@ -358,7 +358,7 @@ fail:
 fail_sec:
 	if (!VM_UB_PRIVATE(oldflags, vma->vm_file) &&
 	    VM_UB_PRIVATE(newflags, vma->vm_file))
-		uncharge_beancounter_fast(mm->mm_ub, UB_PRIVVMPAGES, nrpages);
+		uncharge_beancounter_fast(mm_ub(mm), UB_PRIVVMPAGES, nrpages);
 fail_ch:
 	return error;
 }