vserver 1.9.3

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

diff --git a/include/linux/page-flags.h b/include/linux/page-flags.h
index 1d376d0..9732517 100644 (file)
--- a/include/linux/page-flags.h
+++ b/include/linux/page-flags.h
@@ -69,14 +69,11 @@
 #define PG_private             12      /* Has something at ->private */
 #define PG_writeback           13      /* Page is under writeback */
 #define PG_nosave              14      /* Used for system suspend/resume */
-#define PG_maplock             15      /* Lock bit for rmap to ptes */
+#define PG_compound            15      /* Part of a compound page */
 
 #define PG_swapcache           16      /* Swap page: swp_entry_t in private */
 #define PG_mappedtodisk                17      /* Has blocks allocated on-disk */
 #define PG_reclaim             18      /* To be reclaimed asap */
-#define PG_compound            19      /* Part of a compound page */
-
-#define PG_anon                        20      /* Anonymous: anon_vma in mapping */
 
 
 /*
@@ -194,16 +191,10 @@ extern unsigned long __read_page_state(unsigned offset);
 #define ClearPageReferenced(page)      clear_bit(PG_referenced, &(page)->flags)
 #define TestClearPageReferenced(page) test_and_clear_bit(PG_referenced, &(page)->flags)
 
-#ifndef arch_set_page_uptodate
-#define arch_set_page_uptodate(page) do { } while (0)
-#endif
-
 #define PageUptodate(page)     test_bit(PG_uptodate, &(page)->flags)
-#define SetPageUptodate(page) \
-       do {                                                            \
-               arch_set_page_uptodate(page);                           \
-               set_bit(PG_uptodate, &(page)->flags);                   \
-       } while (0)
+#ifndef SetPageUptodate
+#define SetPageUptodate(page)  set_bit(PG_uptodate, &(page)->flags)
+#endif
 #define ClearPageUptodate(page)        clear_bit(PG_uptodate, &(page)->flags)
 
 #define PageDirty(page)                test_bit(PG_dirty, &(page)->flags)
@@ -242,6 +233,7 @@ extern unsigned long __read_page_state(unsigned offset);
 #define PageReserved(page)     test_bit(PG_reserved, &(page)->flags)
 #define SetPageReserved(page)  set_bit(PG_reserved, &(page)->flags)
 #define ClearPageReserved(page)        clear_bit(PG_reserved, &(page)->flags)
+#define __ClearPageReserved(page)      __clear_bit(PG_reserved, &(page)->flags)
 
 #define SetPagePrivate(page)   set_bit(PG_private, &(page)->flags)
 #define ClearPagePrivate(page) clear_bit(PG_private, &(page)->flags)
@@ -298,10 +290,6 @@ extern unsigned long __read_page_state(unsigned offset);
 #define SetPageCompound(page)  set_bit(PG_compound, &(page)->flags)
 #define ClearPageCompound(page)        clear_bit(PG_compound, &(page)->flags)
 
-#define PageAnon(page)         test_bit(PG_anon, &(page)->flags)
-#define SetPageAnon(page)      set_bit(PG_anon, &(page)->flags)
-#define ClearPageAnon(page)    clear_bit(PG_anon, &(page)->flags)
-
 #ifdef CONFIG_SWAP
 #define PageSwapCache(page)    test_bit(PG_swapcache, &(page)->flags)
 #define SetPageSwapCache(page) set_bit(PG_swapcache, &(page)->flags)