1 files changed, 20 insertions, 133 deletions

diff --git a/include/linux/page-flags.h b/include/linux/page-flags.h
index d276a4e2f825..5748642e9f36 100644
--- a/include/linux/page-flags.h
+++ b/include/linux/page-flags.h
@@ -5,9 +5,7 @@
 #ifndef PAGE_FLAGS_H
 #define PAGE_FLAGS_H
 
-#include <linux/percpu.h>
-#include <linux/cache.h>
-#include <asm/pgtable.h>
+#include <linux/types.h>
 
 /*
  * Various page->flags bits:
@@ -88,135 +86,17 @@
 #define PG_nosave_free          18      /* Free, should not be written */
 #define PG_buddy                19      /* Page is free, on buddy lists */
 
-#define PG_uncached             20      /* Page has been mapped as uncached */
 
+#if (BITS_PER_LONG > 32)
 /*
- * Global page accounting.  One instance per CPU.  Only unsigned longs are
- * allowed.
+ * 64-bit-only flags build down from bit 31
  *
- * - Fields can be modified with xxx_page_state and xxx_page_state_zone at
- * any time safely (which protects the instance from modification by
- * interrupt.
- * - The __xxx_page_state variants can be used safely when interrupts are
- * disabled.
- * - The __xxx_page_state variants can be used if the field is only
- * modified from process context and protected from preemption, or only
- * modified from interrupt context.  In this case, the field should be
- * commented here.
+ * 32 bit  -------------------------------| FIELDS |       FLAGS         |
+ * 64 bit  |           FIELDS             | ??????         FLAGS         |
+ *         63                            32                              0
  */
-struct page_state {
-        unsigned long nr_dirty;         /* Dirty writeable pages */
-        unsigned long nr_writeback;     /* Pages under writeback */
-        unsigned long nr_unstable;      /* NFS unstable pages */
-        unsigned long nr_page_table_pages;/* Pages used for pagetables */
-        unsigned long nr_mapped;        /* mapped into pagetables.
-                                         * only modified from process context */
-        unsigned long nr_slab;          /* In slab */
-#define GET_PAGE_STATE_LAST nr_slab
-
-        /*
-         * The below are zeroed by get_page_state().  Use get_full_page_state()
-         * to add up all these.
-         */
-        unsigned long pgpgin;           /* Disk reads */
-        unsigned long pgpgout;          /* Disk writes */
-        unsigned long pswpin;           /* swap reads */
-        unsigned long pswpout;          /* swap writes */
-
-        unsigned long pgalloc_high;     /* page allocations */
-        unsigned long pgalloc_normal;
-        unsigned long pgalloc_dma32;
-        unsigned long pgalloc_dma;
-
-        unsigned long pgfree;           /* page freeings */
-        unsigned long pgactivate;       /* pages moved inactive->active */
-        unsigned long pgdeactivate;     /* pages moved active->inactive */
-
-        unsigned long pgfault;          /* faults (major+minor) */
-        unsigned long pgmajfault;       /* faults (major only) */
-
-        unsigned long pgrefill_high;    /* inspected in refill_inactive_zone */
-        unsigned long pgrefill_normal;
-        unsigned long pgrefill_dma32;
-        unsigned long pgrefill_dma;
-
-        unsigned long pgsteal_high;     /* total highmem pages reclaimed */
-        unsigned long pgsteal_normal;
-        unsigned long pgsteal_dma32;
-        unsigned long pgsteal_dma;
-
-        unsigned long pgscan_kswapd_high;/* total highmem pages scanned */
-        unsigned long pgscan_kswapd_normal;
-        unsigned long pgscan_kswapd_dma32;
-        unsigned long pgscan_kswapd_dma;
-
-        unsigned long pgscan_direct_high;/* total highmem pages scanned */
-        unsigned long pgscan_direct_normal;
-        unsigned long pgscan_direct_dma32;
-        unsigned long pgscan_direct_dma;
-
-        unsigned long pginodesteal;     /* pages reclaimed via inode freeing */
-        unsigned long slabs_scanned;    /* slab objects scanned */
-        unsigned long kswapd_steal;     /* pages reclaimed by kswapd */
-        unsigned long kswapd_inodesteal;/* reclaimed via kswapd inode freeing */
-        unsigned long pageoutrun;       /* kswapd's calls to page reclaim */
-        unsigned long allocstall;       /* direct reclaim calls */
-
-        unsigned long pgrotated;        /* pages rotated to tail of the LRU */
-        unsigned long nr_bounce;        /* pages for bounce buffers */
-};
-
-extern void get_page_state(struct page_state *ret);
-extern void get_page_state_node(struct page_state *ret, int node);
-extern void get_full_page_state(struct page_state *ret);
-extern unsigned long read_page_state_offset(unsigned long offset);
-extern void mod_page_state_offset(unsigned long offset, unsigned long delta);
-extern void __mod_page_state_offset(unsigned long offset, unsigned long delta);
-
-#define read_page_state(member) \
-        read_page_state_offset(offsetof(struct page_state, member))
-
-#define mod_page_state(member, delta)   \
-        mod_page_state_offset(offsetof(struct page_state, member), (delta))
-
-#define __mod_page_state(member, delta) \
-        __mod_page_state_offset(offsetof(struct page_state, member), (delta))
-
-#define inc_page_state(member)          mod_page_state(member, 1UL)
-#define dec_page_state(member)          mod_page_state(member, 0UL - 1)
-#define add_page_state(member,delta)    mod_page_state(member, (delta))
-#define sub_page_state(member,delta)    mod_page_state(member, 0UL - (delta))
-
-#define __inc_page_state(member)        __mod_page_state(member, 1UL)
-#define __dec_page_state(member)        __mod_page_state(member, 0UL - 1)
-#define __add_page_state(member,delta)  __mod_page_state(member, (delta))
-#define __sub_page_state(member,delta)  __mod_page_state(member, 0UL - (delta))
-
-#define page_state(member) (*__page_state(offsetof(struct page_state, member)))
-
-#define state_zone_offset(zone, member)                                 \
-({                                                                      \
-        unsigned offset;                                                \
-        if (is_highmem(zone))                                           \
-                offset = offsetof(struct page_state, member##_high);    \
-        else if (is_normal(zone))                                       \
-                offset = offsetof(struct page_state, member##_normal);  \
-        else if (is_dma32(zone))                                        \
-                offset = offsetof(struct page_state, member##_dma32);   \
-        else                                                            \
-                offset = offsetof(struct page_state, member##_dma);     \
-        offset;                                                         \
-})
-
-#define __mod_page_state_zone(zone, member, delta)                      \
- do {                                                                   \
-        __mod_page_state_offset(state_zone_offset(zone, member), (delta)); \
- } while (0)
-
-#define mod_page_state_zone(zone, member, delta)                        \
- do {                                                                   \
-        mod_page_state_offset(state_zone_offset(zone, member), (delta)); \
- } while (0)
+#define PG_uncached             31      /* Page has been mapped as uncached */
+#endif
 
 /*
  * Manipulation of page state flags
@@ -242,7 +122,14 @@ extern void __mod_page_state_offset(unsigned long offset, unsigned long delta);
 #define TestClearPageReferenced(page) test_and_clear_bit(PG_referenced, &(page)->flags)
 
 #define PageUptodate(page)      test_bit(PG_uptodate, &(page)->flags)
-#ifndef SetPageUptodate
+#ifdef CONFIG_S390
+#define SetPageUptodate(_page) \
+        do {                                                                  \
+                struct page *__page = (_page);                                \
+                if (!test_and_set_bit(PG_uptodate, &__page->flags))           \
+                        page_test_and_clear_dirty(_page);                     \
+        } while (0)
+#else
 #define SetPageUptodate(page)   set_bit(PG_uptodate, &(page)->flags)
 #endif
 #define ClearPageUptodate(page) clear_bit(PG_uptodate, &(page)->flags)
@@ -294,7 +181,7 @@ extern void __mod_page_state_offset(unsigned long offset, unsigned long delta);
         do {                                                            \
                 if (!test_and_set_bit(PG_writeback,                     \
                                 &(page)->flags))                        \
-                        inc_page_state(nr_writeback);                   \
+                        inc_zone_page_state(page, NR_WRITEBACK);        \
         } while (0)
 #define TestSetPageWriteback(page)                                      \
         ({                                                              \
@@ -302,14 +189,14 @@ extern void __mod_page_state_offset(unsigned long offset, unsigned long delta);
                 ret = test_and_set_bit(PG_writeback,                    \
                                         &(page)->flags);                \
                 if (!ret)                                               \
-                        inc_page_state(nr_writeback);                   \
+                        inc_zone_page_state(page, NR_WRITEBACK);        \
                 ret;                                                    \
         })
 #define ClearPageWriteback(page)                                        \
         do {                                                            \
                 if (test_and_clear_bit(PG_writeback,                    \
                                 &(page)->flags))                        \
-                        dec_page_state(nr_writeback);                   \
+                        dec_zone_page_state(page, NR_WRITEBACK);        \
         } while (0)
 #define TestClearPageWriteback(page)                                    \
         ({                                                              \
@@ -317,7 +204,7 @@ extern void __mod_page_state_offset(unsigned long offset, unsigned long delta);
                 ret = test_and_clear_bit(PG_writeback,                  \
                                 &(page)->flags);                        \
                 if (ret)                                                \
-                        dec_page_state(nr_writeback);                   \
+                        dec_zone_page_state(page, NR_WRITEBACK);        \
                 ret;                                                    \
         })