[Devel] [PATCH RHEL7 COMMIT] bc/mm: zap page->{slab_ubs,kmem_ub}

[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 3e695c5023b8e1a6f2ac61a1e94ffcbd7b897fa3
Author: Vladimir Davydov <vdavydov at parallels.com>
Date:   Tue May 26 18:00:24 2015 +0400

    bc/mm: zap page->{slab_ubs,kmem_ub}
    
    This is a leftover from UBC kmem accounting, which is now handled by
    memcg.
    
    Signed-off-by: Vladimir Davydov <vdavydov at parallels.com>
---
 include/linux/mm_types.h | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h
index 5ddfa80..fd501ae 100644
--- a/include/linux/mm_types.h
+++ b/include/linux/mm_types.h
@@ -187,12 +187,6 @@ struct page {
 #ifdef LAST_CPUPID_NOT_IN_PAGE_FLAGS
 	int _last_cpupid;
 #endif
-	union {
-#ifdef CONFIG_BEANCOUNTERS
-		struct user_beancounter *kmem_ub;
-		struct user_beancounter **slub_ubs;
-#endif
-	};
 }
 /*
  * The struct page can be forced to be double word aligned so that atomic ops
@@ -212,12 +206,6 @@ struct page_frag {
 	__u16 offset;
 	__u16 size;
 #endif
-	union {
-#ifdef CONFIG_BEANCOUNTERS
-		struct user_beancounter *kmem_ub;
-		struct user_beancounter **slub_ubs;
-#endif
-	};
 };
 
 typedef unsigned long __nocast vm_flags_t;