sgiioc4: use ide_host_add() (take 2)

[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 96e970485b6c0d4b6a3b80f1df222b51be1bda35..c948350c378e93cb9144e9c17c52f3445e8f4a80 100644 (file)
--- a/include/linux/mm_inline.h
+++ b/include/linux/mm_inline.h
@@ -5,7 +5,7 @@
  * page_is_file_cache - should the page be on a file LRU or anon LRU?
  * @page: the page to test
  *
- * Returns !0 if @page is page cache page backed by a regular filesystem,
+ * Returns LRU_FILE if @page is page cache page backed by a regular filesystem,
  * or 0 if @page is anonymous, tmpfs or otherwise ram or swap backed.
  * Used by functions that manipulate the LRU lists, to sort a page
  * onto the right LRU list.
@@ -20,7 +20,7 @@ static inline int page_is_file_cache(struct page *page)
                return 0;
 
        /* The page is page cache backed by a normal filesystem. */
-       return 1;
+       return LRU_FILE;
 }
 
 static inline void
@@ -37,39 +37,21 @@ del_page_from_lru_list(struct zone *zone, struct page *page, enum lru_list l)
        __dec_zone_state(zone, NR_LRU_BASE + l);
 }
 
-static inline void
-add_page_to_active_list(struct zone *zone, struct page *page)
-{
-       add_page_to_lru_list(zone, page, LRU_ACTIVE);
-}
-
-static inline void
-add_page_to_inactive_list(struct zone *zone, struct page *page)
-{
-       add_page_to_lru_list(zone, page, LRU_INACTIVE);
-}
-
-static inline void
-del_page_from_active_list(struct zone *zone, struct page *page)
-{
-       del_page_from_lru_list(zone, page, LRU_ACTIVE);
-}
-
-static inline void
-del_page_from_inactive_list(struct zone *zone, struct page *page)
-{
-       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;
+       enum lru_list l = LRU_BASE;
 
        list_del(&page->lru);
-       if (PageActive(page)) {
-               __ClearPageActive(page);
-               l = LRU_ACTIVE;
+       if (PageUnevictable(page)) {
+               __ClearPageUnevictable(page);
+               l = LRU_UNEVICTABLE;
+       } else {
+               if (PageActive(page)) {
+                       __ClearPageActive(page);
+                       l += LRU_ACTIVE;
+               }
+               l += page_is_file_cache(page);
        }
        __dec_zone_state(zone, NR_LRU_BASE + l);
 }
@@ -85,10 +67,34 @@ static inline enum lru_list page_lru(struct page *page)
 {
        enum lru_list lru = LRU_BASE;
 
-       if (PageActive(page))
-               lru += LRU_ACTIVE;
+       if (PageUnevictable(page))
+               lru = LRU_UNEVICTABLE;
+       else {
+               if (PageActive(page))
+                       lru += LRU_ACTIVE;
+               lru += page_is_file_cache(page);
+       }
 
        return lru;
 }
 
+/**
+ * inactive_anon_is_low - check if anonymous pages need to be deactivated
+ * @zone: zone to check
+ *
+ * Returns true if the zone does not have enough inactive anon pages,
+ * meaning some active anon pages need to be deactivated.
+ */
+static inline int inactive_anon_is_low(struct zone *zone)
+{
+       unsigned long active, inactive;
+
+       active = zone_page_state(zone, NR_ACTIVE_ANON);
+       inactive = zone_page_state(zone, NR_INACTIVE_ANON);
+
+       if (inactive * zone->inactive_ratio < active)
+               return 1;
+
+       return 0;
+}
 #endif