1 files changed, 7 insertions, 7 deletions

diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index 45cd1f84268a..7160cfab8107 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -2362,13 +2362,13 @@ static void cancel_charge(struct mem_cgroup *memcg, unsigned int nr_pages)
 
 static void lock_page_lru(struct page *page, int *isolated)
 {
-        struct zone *zone = page_zone(page);
+        pg_data_t *pgdat = page_pgdat(page);
 
-        spin_lock_irq(zone_lru_lock(zone));
+        spin_lock_irq(&pgdat->lru_lock);
         if (PageLRU(page)) {
                 struct lruvec *lruvec;
 
-                lruvec = mem_cgroup_page_lruvec(page, zone->zone_pgdat);
+                lruvec = mem_cgroup_page_lruvec(page, pgdat);
                 ClearPageLRU(page);
                 del_page_from_lru_list(page, lruvec, page_lru(page));
                 *isolated = 1;
@@ -2378,17 +2378,17 @@ static void lock_page_lru(struct page *page, int *isolated)
 
 static void unlock_page_lru(struct page *page, int isolated)
 {
-        struct zone *zone = page_zone(page);
+        pg_data_t *pgdat = page_pgdat(page);
 
         if (isolated) {
                 struct lruvec *lruvec;
 
-                lruvec = mem_cgroup_page_lruvec(page, zone->zone_pgdat);
+                lruvec = mem_cgroup_page_lruvec(page, pgdat);
                 VM_BUG_ON_PAGE(PageLRU(page), page);
                 SetPageLRU(page);
                 add_page_to_lru_list(page, lruvec, page_lru(page));
         }
-        spin_unlock_irq(zone_lru_lock(zone));
+        spin_unlock_irq(&pgdat->lru_lock);
 }
 
 static void commit_charge(struct page *page, struct mem_cgroup *memcg,
@@ -2674,7 +2674,7 @@ void __memcg_kmem_uncharge(struct page *page, int order)
 
 /*
  * Because tail pages are not marked as "used", set it. We're under
- * zone_lru_lock and migration entries setup in all page mappings.
+ * pgdat->lru_lock and migration entries setup in all page mappings.
  */
 void mem_cgroup_split_huge_fixup(struct page *head)
 {