This commit was manufactured by cvs2svn to create tag 'planetlab_1'.

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

diff --git a/mm/vmscan.c b/mm/vmscan.c
index e01d5c9..fa5a5e7 100644 (file)
--- a/mm/vmscan.c
+++ b/mm/vmscan.c
@@ -39,12 +39,6 @@
 #include <linux/swapops.h>
 #include <linux/ckrm_mem.h>
 
-#ifndef AT_LIMIT_SUPPORT
-#warning "ckrm_at_limit disabled due to problems with memory hog tests -- seting ckrm_shrink_list_empty to true"
-#undef ckrm_shrink_list_empty
-#define ckrm_shrink_list_empty()               (1)
-#endif
-
 /* possible outcome of pageout() */
 typedef enum {
        /* failed to write page out, page is locked */
@@ -725,8 +719,8 @@ redo:
                        list_add(&page->lru, &l_hold);
                        ckrm_mem_dec_active(page);
                        pgmoved++;
-                       pgscanned++;
-               }
+               pgscanned++;
+       }
                if (!--nr_pass && ckrm_flags) {
                        goto redo;
                }
@@ -901,7 +895,7 @@ shrink_zone(struct zone *zone, struct scan_control *sc)
        }
 }
 
-#if defined(CONFIG_CKRM_RES_MEM) && defined(AT_LIMIT_SUPPORT)
+#ifdef CONFIG_CKRM_RES_MEM
 // This function needs to be given more thought.
 // Shrink the class to be at 90% of its limit
 static void
@@ -1001,11 +995,6 @@ ckrm_shrink_classes(void)
 }
 
 #else
-
-#if defined(CONFIG_CKRM_RES_MEM) && !defined(AT_LIMIT_SUPPORT)
-#warning "disabling ckrm_at_limit -- setting ckrm_shrink_classes to noop "
-#endif
-
 #define ckrm_shrink_classes()  do { } while(0)
 #endif