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

[linux-2.6.git] / include / linux / page-flags.h

diff --git a/include/linux/page-flags.h b/include/linux/page-flags.h
index 282141e..c99f570 100644 (file)
--- a/include/linux/page-flags.h
+++ b/include/linux/page-flags.h
@@ -75,7 +75,10 @@
 #define PG_mappedtodisk                17      /* Has blocks allocated on-disk */
 #define PG_reclaim             18      /* To be reclaimed asap */
 
-#define PG_ckrm_account                20      /* CKRM accounting */
+#ifdef CONFIG_CKRM_RES_MEM
+#define PG_ckrm_account                19      /* This page is accounted by CKRM */
+#endif
+
 
 /*
  * Global page accounting.  One instance per CPU.  Only unsigned longs are
@@ -300,9 +303,9 @@ extern unsigned long __read_page_state(unsigned offset);
 #endif
 
 #ifdef CONFIG_CKRM_RES_MEM
-#define PageCkrmAccount(page)          test_bit(PG_ckrm_account, &(page)->flags)
-#define SetPageCkrmAccount(page)       set_bit(PG_ckrm_account, &(page)->flags)
-#define ClearPageCkrmAccount(page)     clear_bit(PG_ckrm_account, &(page)->flags)
+#define CkrmAccount(page)      test_bit(PG_ckrm_account, &(page)->flags)
+#define SetCkrmAccount(page)   set_bit(PG_ckrm_account, &(page)->flags)
+#define ClearCkrmAccount(page) clear_bit(PG_ckrm_account, &(page)->flags)
 #endif
 
 struct page;   /* forward declaration */