[Devel] [PATCH RHEL7 COMMIT] bc/mm: zap pte_ptrs and same_ub macros

[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.5.5
------>
commit 0fbf24f5927de7e7c9a31e9213ad9975f3aa2adc
Author: Vladimir Davydov <vdavydov at parallels.com>
Date:   Tue May 26 18:59:12 2015 +0400

    bc/mm: zap pte_ptrs and same_ub macros
    
    They were added by commit 1da9426dc5c49, which ported stuff from RH6.
    They are not used, so zap them.
    
    Signed-off-by: Vladimir Davydov <vdavydov at parallels.com>
---
 mm/memory.c | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/mm/memory.c b/mm/memory.c
index 1214542..2f09839 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -917,13 +917,6 @@ out_set_pte:
 	return 0;
 }
 
-#define pte_ptrs(a)	(PTRS_PER_PTE - ((a >> PAGE_SHIFT)&(PTRS_PER_PTE - 1)))
-#ifdef CONFIG_BEANCOUNTERS
-#define same_ub(mm1, mm2)      ((mm1)->mm_ub == (mm2)->mm_ub)
-#else
-#define same_ub(mm1, mm2)      1
-#endif
-
 int copy_pte_range(struct mm_struct *dst_mm, struct mm_struct *src_mm,
 		   pmd_t *dst_pmd, pmd_t *src_pmd, struct vm_area_struct *vma,
 		   unsigned long addr, unsigned long end)