aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mm/memcontrol.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index 5e95996ddfb1..3eed583895a6 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -919,7 +919,7 @@ unsigned long mem_cgroup_zone_nr_pages(struct mem_cgroup *memcg,
919 struct zone *zone, 919 struct zone *zone,
920 enum lru_list lru) 920 enum lru_list lru)
921{ 921{
922 int nid = zone->zone_pgdat->node_id; 922 int nid = zone_to_nid(zone);
923 int zid = zone_idx(zone); 923 int zid = zone_idx(zone);
924 struct mem_cgroup_per_zone *mz = mem_cgroup_zoneinfo(memcg, nid, zid); 924 struct mem_cgroup_per_zone *mz = mem_cgroup_zoneinfo(memcg, nid, zid);
925 925
@@ -929,7 +929,7 @@ unsigned long mem_cgroup_zone_nr_pages(struct mem_cgroup *memcg,
929struct zone_reclaim_stat *mem_cgroup_get_reclaim_stat(struct mem_cgroup *memcg, 929struct zone_reclaim_stat *mem_cgroup_get_reclaim_stat(struct mem_cgroup *memcg,
930 struct zone *zone) 930 struct zone *zone)
931{ 931{
932 int nid = zone->zone_pgdat->node_id; 932 int nid = zone_to_nid(zone);
933 int zid = zone_idx(zone); 933 int zid = zone_idx(zone);
934 struct mem_cgroup_per_zone *mz = mem_cgroup_zoneinfo(memcg, nid, zid); 934 struct mem_cgroup_per_zone *mz = mem_cgroup_zoneinfo(memcg, nid, zid);
935 935
@@ -974,7 +974,7 @@ unsigned long mem_cgroup_isolate_pages(unsigned long nr_to_scan,
974 LIST_HEAD(pc_list); 974 LIST_HEAD(pc_list);
975 struct list_head *src; 975 struct list_head *src;
976 struct page_cgroup *pc, *tmp; 976 struct page_cgroup *pc, *tmp;
977 int nid = z->zone_pgdat->node_id; 977 int nid = zone_to_nid(z);
978 int zid = zone_idx(z); 978 int zid = zone_idx(z);
979 struct mem_cgroup_per_zone *mz; 979 struct mem_cgroup_per_zone *mz;
980 int lru = LRU_FILE * file + active; 980 int lru = LRU_FILE * file + active;