vmscan: Use an indexed array for LRU variables

[linux-2.6-omap-h63xx.git] / include / linux / mm_inline.h

diff --git a/include/linux/mm_inline.h b/include/linux/mm_inline.h
index 3b6723dfaff38f50bb8fa75e9b99072d9c2d69ba..2704729777eff9049c1758914f375ae29a8f582d 100644 (file)
--- a/include/linux/mm_inline.h
+++ b/include/linux/mm_inline.h
@@ -1,41 +1,67 @@
+static inline void
+add_page_to_lru_list(struct zone *zone, struct page *page, enum lru_list l)
+{
+       list_add(&page->lru, &zone->lru[l].list);
+       __inc_zone_state(zone, NR_LRU_BASE + l);
+}
+
+static inline void
+del_page_from_lru_list(struct zone *zone, struct page *page, enum lru_list l)
+{
+       list_del(&page->lru);
+       __dec_zone_state(zone, NR_LRU_BASE + l);
+}
 
 static inline void
 add_page_to_active_list(struct zone *zone, struct page *page)
 {
-       list_add(&page->lru, &zone->active_list);
-       zone->nr_active++;
+       add_page_to_lru_list(zone, page, LRU_ACTIVE);
 }
 
 static inline void
 add_page_to_inactive_list(struct zone *zone, struct page *page)
 {
-       list_add(&page->lru, &zone->inactive_list);
-       zone->nr_inactive++;
+       add_page_to_lru_list(zone, page, LRU_INACTIVE);
 }
 
 static inline void
 del_page_from_active_list(struct zone *zone, struct page *page)
 {
-       list_del(&page->lru);
-       zone->nr_active--;
+       del_page_from_lru_list(zone, page, LRU_ACTIVE);
 }
 
 static inline void
 del_page_from_inactive_list(struct zone *zone, struct page *page)
 {
-       list_del(&page->lru);
-       zone->nr_inactive--;
+       del_page_from_lru_list(zone, page, LRU_INACTIVE);
 }
 
 static inline void
 del_page_from_lru(struct zone *zone, struct page *page)
 {
+       enum lru_list l = LRU_INACTIVE;
+
        list_del(&page->lru);
        if (PageActive(page)) {
                __ClearPageActive(page);
-               zone->nr_active--;
-       } else {
-               zone->nr_inactive--;
+               l = LRU_ACTIVE;
        }
+       __dec_zone_state(zone, NR_LRU_BASE + l);
 }
 
+/**
+ * page_lru - which LRU list should a page be on?
+ * @page: the page to test
+ *
+ * Returns the LRU list a page should be on, as an index
+ * into the array of LRU lists.
+ */
+static inline enum lru_list page_lru(struct page *page)
+{
+       enum lru_list lru = LRU_BASE;
+
+       if (PageActive(page))
+               lru += LRU_ACTIVE;
+
+       return lru;
+}