Revert to pre E17 ckrm memory controller back port code, which apparently

[linux-2.6.git] / mm / page_alloc.c

diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 2aedd4d..8c206e4 100644 (file)
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -35,7 +35,6 @@
 #include <linux/vs_base.h>
 #include <linux/vs_limit.h>
 #include <linux/nodemask.h>
-#include <linux/ckrm_mem_inline.h>
 
 #include <asm/tlbflush.h>
 
@@ -276,7 +275,7 @@ free_pages_bulk(struct zone *zone, int count,
                /* have to delete it as __free_pages_bulk list manipulates */
                list_del(&page->lru);
                __free_pages_bulk(page, base, zone, area, order);
-               ckrm_clear_page_class(page);
+               ckrm_clear_page_class(page);
                ret++;
        }
        spin_unlock_irqrestore(&zone->lock, flags);
@@ -372,7 +371,9 @@ static void prep_new_page(struct page *page, int order)
 #endif
                        1 << PG_checked | 1 << PG_mappedtodisk);
        page->private = 0;
-       ckrm_page_init(page);
+#ifdef CONFIG_CKRM_RES_MEM
+       page->ckrm_zone = NULL;
+#endif
        set_page_refs(page, order);
 }
 
@@ -635,8 +636,9 @@ __alloc_pages(unsigned int gfp_mask, unsigned int order,
         */
        can_try_harder = (unlikely(rt_task(p)) && !in_interrupt()) || !wait;
 
-       if (!in_interrupt() && !ckrm_class_limit_ok(ckrm_get_mem_class(p)))
+       if (!ckrm_class_limit_ok((ckrm_get_mem_class(current)))) {
                return NULL;
+       }
 
        zones = zonelist->zones;  /* the list of zones suitable for gfp_mask */
 
@@ -1571,7 +1573,10 @@ static void __init free_area_init_core(struct pglist_data *pgdat,
                }
                printk(KERN_DEBUG "  %s zone: %lu pages, LIFO batch:%lu\n",
                                zone_names[j], realsize, batch);
-               ckrm_init_lists(zone);
+#ifndef CONFIG_CKRM_RES_MEM
+               INIT_LIST_HEAD(&zone->active_list);
+               INIT_LIST_HEAD(&zone->inactive_list);
+#endif
                zone->nr_scan_active = 0;
                zone->nr_scan_inactive = 0;
                zone->nr_active = 0;