linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / arch / s390 / appldata / appldata_mem.c

diff --git a/arch/s390/appldata/appldata_mem.c b/arch/s390/appldata/appldata_mem.c
index ab3b076..f0e2fbe 100644 (file)
--- a/arch/s390/appldata/appldata_mem.c
+++ b/arch/s390/appldata/appldata_mem.c
@@ -4,11 +4,12 @@
  * Data gathering module for Linux-VM Monitor Stream, Stage 1.
  * Collects data related to memory management.
  *
- * Copyright (C) 2003,2006 IBM Corporation, IBM Deutschland Entwicklung GmbH.
+ * Copyright (C) 2003 IBM Corporation, IBM Deutschland Entwicklung GmbH.
  *
- * Author: Gerald Schaefer <gerald.schaefer@de.ibm.com>
+ * Author: Gerald Schaefer <geraldsc@de.ibm.com>
  */
 
+#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/slab.h>
@@ -106,21 +107,21 @@ static void appldata_get_mem_data(void *data)
         * serialized through the appldata_ops_lock and can use static
         */
        static struct sysinfo val;
-       unsigned long ev[NR_VM_EVENT_ITEMS];
+       static struct page_state ps;
        struct appldata_mem_data *mem_data;
 
        mem_data = data;
        mem_data->sync_count_1++;
 
-       all_vm_events(ev);
-       mem_data->pgpgin     = ev[PGPGIN] >> 1;
-       mem_data->pgpgout    = ev[PGPGOUT] >> 1;
-       mem_data->pswpin     = ev[PSWPIN];
-       mem_data->pswpout    = ev[PSWPOUT];
-       mem_data->pgalloc    = ev[PGALLOC_HIGH] + ev[PGALLOC_NORMAL] +
-                              ev[PGALLOC_DMA];
-       mem_data->pgfault    = ev[PGFAULT];
-       mem_data->pgmajfault = ev[PGMAJFAULT];
+       get_full_page_state(&ps);
+       mem_data->pgpgin     = ps.pgpgin >> 1;
+       mem_data->pgpgout    = ps.pgpgout >> 1;
+       mem_data->pswpin     = ps.pswpin;
+       mem_data->pswpout    = ps.pswpout;
+       mem_data->pgalloc    = ps.pgalloc_high + ps.pgalloc_normal +
+                              ps.pgalloc_dma;
+       mem_data->pgfault    = ps.pgfault;
+       mem_data->pgmajfault = ps.pgmajfault;
 
        si_meminfo(&val);
        mem_data->sharedram = val.sharedram;
@@ -129,8 +130,7 @@ static void appldata_get_mem_data(void *data)
        mem_data->totalhigh = P2K(val.totalhigh);
        mem_data->freehigh  = P2K(val.freehigh);
        mem_data->bufferram = P2K(val.bufferram);
-       mem_data->cached    = P2K(global_page_state(NR_FILE_PAGES)
-                               - val.bufferram);
+       mem_data->cached    = P2K(atomic_read(&nr_pagecache) - val.bufferram);
 
        si_swapinfo(&val);
        mem_data->totalswap = P2K(val.totalswap);
@@ -152,7 +152,6 @@ static struct appldata_ops ops = {
        .callback  = &appldata_get_mem_data,
        .data      = &appldata_mem_data,
        .owner     = THIS_MODULE,
-       .mod_lvl   = {0xF0, 0xF0},              /* EBCDIC "00" */
 };