2 files changed, 12 insertions, 12 deletions

diff --git a/arch/s390/appldata/appldata_base.c b/arch/s390/appldata/appldata_base.c
index 8937318411aa..d0f82c995af6 100644
--- a/arch/s390/appldata/appldata_base.c
+++ b/arch/s390/appldata/appldata_base.c
@@ -765,7 +765,6 @@ unsigned long nr_iowait(void)
 #endif /* MODULE */
 EXPORT_SYMBOL_GPL(si_swapinfo);
 EXPORT_SYMBOL_GPL(nr_threads);
-EXPORT_SYMBOL_GPL(get_full_page_state);
 EXPORT_SYMBOL_GPL(nr_running);
 EXPORT_SYMBOL_GPL(nr_iowait);
 //EXPORT_SYMBOL_GPL(nr_context_switches);
diff --git a/arch/s390/appldata/appldata_mem.c b/arch/s390/appldata/appldata_mem.c
index 7165c8f8d3dc..ab3b0765a64e 100644
--- a/arch/s390/appldata/appldata_mem.c
+++ b/arch/s390/appldata/appldata_mem.c
@@ -106,21 +106,21 @@ static void appldata_get_mem_data(void *data)
          * serialized through the appldata_ops_lock and can use static
          */
         static struct sysinfo val;
-        static struct page_state ps;
+        unsigned long ev[NR_VM_EVENT_ITEMS];
         struct appldata_mem_data *mem_data;
 
         mem_data = data;
         mem_data->sync_count_1++;
 
-        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;
+        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];
 
         si_meminfo(&val);
         mem_data->sharedram = val.sharedram;
@@ -129,7 +129,8 @@ 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(atomic_read(&nr_pagecache) - val.bufferram);
+        mem_data->cached    = P2K(global_page_state(NR_FILE_PAGES)
+                                - val.bufferram);
 
         si_swapinfo(&val);
         mem_data->totalswap = P2K(val.totalswap);