[WEXT] net_device: Don't include wext bits if not required.

[pandora-kernel.git] / include / linux / mm_inline.h

diff --git a/include/linux/mm_inline.h b/include/linux/mm_inline.h
index 49cc68a..895bc4e 100644 (file)
--- a/include/linux/mm_inline.h
+++ b/include/linux/mm_inline.h
@@ -1,30 +1,29 @@
-
 static inline void
 add_page_to_active_list(struct zone *zone, struct page *page)
 {
        list_add(&page->lru, &zone->active_list);
-       zone->nr_active++;
+       __inc_zone_state(zone, NR_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++;
+       __inc_zone_state(zone, NR_INACTIVE);
 }
 
 static inline void
 del_page_from_active_list(struct zone *zone, struct page *page)
 {
        list_del(&page->lru);
-       zone->nr_active--;
+       __dec_zone_state(zone, NR_ACTIVE);
 }
 
 static inline void
 del_page_from_inactive_list(struct zone *zone, struct page *page)
 {
        list_del(&page->lru);
-       zone->nr_inactive--;
+       __dec_zone_state(zone, NR_INACTIVE);
 }
 
 static inline void
@@ -32,31 +31,10 @@ del_page_from_lru(struct zone *zone, struct page *page)
 {
        list_del(&page->lru);
        if (PageActive(page)) {
-               ClearPageActive(page);
-               zone->nr_active--;
+               __ClearPageActive(page);
+               __dec_zone_state(zone, NR_ACTIVE);
        } else {
-               zone->nr_inactive--;
+               __dec_zone_state(zone, NR_INACTIVE);
        }
 }
 
-/*
- * Isolate one page from the LRU lists.
- *
- * - zone->lru_lock must be held
- */
-static inline int __isolate_lru_page(struct page *page)
-{
-       if (unlikely(!TestClearPageLRU(page)))
-               return 0;
-
-       if (get_page_testone(page)) {
-               /*
-                * It is being freed elsewhere
-                */
-               __put_page(page);
-               SetPageLRU(page);
-               return -ENOENT;
-       }
-
-       return 1;
-}