Merge tag 'sound-fix-4.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai...

[karo-tx-linux.git] / include / linux / mm_inline.h

diff --git a/include/linux/mm_inline.h b/include/linux/mm_inline.h
index bcc4ed07fa903e7e80381393df886de4092edd9c..71613e8a720f99b6870f1e3f8957d2761a6ac1a0 100644 (file)
--- a/include/linux/mm_inline.h
+++ b/include/linux/mm_inline.h
@@ -4,22 +4,6 @@
 #include <linux/huge_mm.h>
 #include <linux/swap.h>
 
-#ifdef CONFIG_HIGHMEM
-extern atomic_t highmem_file_pages;
-
-static inline void acct_highmem_file_pages(int zid, enum lru_list lru,
-                                                       int nr_pages)
-{
-       if (is_highmem_idx(zid) && is_file_lru(lru))
-               atomic_add(nr_pages, &highmem_file_pages);
-}
-#else
-static inline void acct_highmem_file_pages(int zid, enum lru_list lru,
-                                                       int nr_pages)
-{
-}
-#endif
-
 /**
  * page_is_file_cache - should the page be on a file LRU or anon LRU?
  * @page: the page to test
@@ -45,7 +29,8 @@ static __always_inline void __update_lru_size(struct lruvec *lruvec,
        struct pglist_data *pgdat = lruvec_pgdat(lruvec);
 
        __mod_node_page_state(pgdat, NR_LRU_BASE + lru, nr_pages);
-       acct_highmem_file_pages(zid, lru, nr_pages);
+       __mod_zone_page_state(&pgdat->node_zones[zid],
+                               NR_ZONE_LRU_BASE + lru, nr_pages);
 }
 
 static __always_inline void update_lru_size(struct lruvec *lruvec,