aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/mmzone.h
diff options
context:
space:
mode:
Diffstat (limited to 'include/linux/mmzone.h')
-rw-r--r--include/linux/mmzone.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h
index 458988bd55a1..3bdfa15b2012 100644
--- a/include/linux/mmzone.h
+++ b/include/linux/mmzone.h
@@ -201,7 +201,7 @@ struct zone_reclaim_stat {
201struct lruvec { 201struct lruvec {
202 struct list_head lists[NR_LRU_LISTS]; 202 struct list_head lists[NR_LRU_LISTS];
203 struct zone_reclaim_stat reclaim_stat; 203 struct zone_reclaim_stat reclaim_stat;
204#ifdef CONFIG_CGROUP_MEM_RES_CTLR 204#ifdef CONFIG_MEMCG
205 struct zone *zone; 205 struct zone *zone;
206#endif 206#endif
207}; 207};
@@ -671,7 +671,7 @@ typedef struct pglist_data {
671 int nr_zones; 671 int nr_zones;
672#ifdef CONFIG_FLAT_NODE_MEM_MAP /* means !SPARSEMEM */ 672#ifdef CONFIG_FLAT_NODE_MEM_MAP /* means !SPARSEMEM */
673 struct page *node_mem_map; 673 struct page *node_mem_map;
674#ifdef CONFIG_CGROUP_MEM_RES_CTLR 674#ifdef CONFIG_MEMCG
675 struct page_cgroup *node_page_cgroup; 675 struct page_cgroup *node_page_cgroup;
676#endif 676#endif
677#endif 677#endif
@@ -736,7 +736,7 @@ extern void lruvec_init(struct lruvec *lruvec, struct zone *zone);
736 736
737static inline struct zone *lruvec_zone(struct lruvec *lruvec) 737static inline struct zone *lruvec_zone(struct lruvec *lruvec)
738{ 738{
739#ifdef CONFIG_CGROUP_MEM_RES_CTLR 739#ifdef CONFIG_MEMCG
740 return lruvec->zone; 740 return lruvec->zone;
741#else 741#else
742 return container_of(lruvec, struct zone, lruvec); 742 return container_of(lruvec, struct zone, lruvec);
@@ -1052,7 +1052,7 @@ struct mem_section {
1052 1052
1053 /* See declaration of similar field in struct zone */ 1053 /* See declaration of similar field in struct zone */
1054 unsigned long *pageblock_flags; 1054 unsigned long *pageblock_flags;
1055#ifdef CONFIG_CGROUP_MEM_RES_CTLR 1055#ifdef CONFIG_MEMCG
1056 /* 1056 /*
1057 * If !SPARSEMEM, pgdat doesn't have page_cgroup pointer. We use 1057 * If !SPARSEMEM, pgdat doesn't have page_cgroup pointer. We use
1058 * section. (see memcontrol.h/page_cgroup.h about this.) 1058 * section. (see memcontrol.h/page_cgroup.h about this.)