The patch titled
light-weight-counters-framework-s390-fix
has been removed from the -mm tree. Its filename is
light-weight-counters-framework-s390-fix.patch
This patch was dropped because it was folded into another patch
------------------------------------------------------
Subject: light-weight-counters-framework-s390-fix
From: Christoph Lameter <clameter@xxxxxxx>
arch/s390/appldata/appldata_mem.c: In function 'appldata_get_mem_data':
Cc: Christoph Lameter <clameter@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
arch/s390/appldata/appldata_mem.c | 22 +++++++++++-----------
include/linux/page-flags.h | 1 +
mm/page_alloc.c | 2 +-
3 files changed, 13 insertions(+), 12 deletions(-)
diff -puN arch/s390/appldata/appldata_mem.c~light-weight-counters-framework-s390-fix arch/s390/appldata/appldata_mem.c
--- devel/arch/s390/appldata/appldata_mem.c~light-weight-counters-framework-s390-fix 2006-06-09 18:18:43.000000000 -0700
+++ devel-akpm/arch/s390/appldata/appldata_mem.c 2006-06-09 18:23:30.000000000 -0700
@@ -107,21 +107,21 @@ static void appldata_get_mem_data(void *
* 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[PGPIN] >> 1;
+ mem_data->pgpgout = ev[PGPOUT] >> 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;
@@ -130,7 +130,7 @@ static void appldata_get_mem_data(void *
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_PAGECACHE) - val.bufferram);
si_swapinfo(&val);
mem_data->totalswap = P2K(val.totalswap);
diff -puN include/linux/page-flags.h~light-weight-counters-framework-s390-fix include/linux/page-flags.h
--- devel/include/linux/page-flags.h~light-weight-counters-framework-s390-fix 2006-06-09 18:18:43.000000000 -0700
+++ devel-akpm/include/linux/page-flags.h 2006-06-09 18:18:43.000000000 -0700
@@ -152,6 +152,7 @@ static inline void count_vm_events(enum
__get_cpu_var(vm_event_states).event[item] += delta;
}
+extern void all_vm_events(unsigned long *);
#else
/* Disable counters */
#define get_cpu_vm_events(e) 0L
diff -puN mm/page_alloc.c~light-weight-counters-framework-s390-fix mm/page_alloc.c
--- devel/mm/page_alloc.c~light-weight-counters-framework-s390-fix 2006-06-09 18:18:43.000000000 -0700
+++ devel-akpm/mm/page_alloc.c 2006-06-09 18:18:43.000000000 -0700
@@ -1540,7 +1540,7 @@ static void sum_vm_events(unsigned long
* The result is unavoidably approximate - it can change
* during and after execution of this function.
*/
-static void all_vm_events(unsigned long *ret)
+void all_vm_events(unsigned long *ret)
{
sum_vm_events(ret, &cpu_online_map);
}
_
Patches currently in -mm which might be from clameter@xxxxxxx are
page-migration-make-do_swap_page-redo-the-fault.patch
slab-extract-cache_free_alien-from-__cache_free.patch
migration-remove-unnecessary-pageswapcache-checks.patch
page-migration-cleanup-rename-ignrefs-to-migration.patch
page-migration-cleanup-group-functions.patch
page-migration-cleanup-remove-useless-definitions.patch
page-migration-cleanup-drop-nr_refs-in-remove_references.patch
page-migration-cleanup-extract-try_to_unmap-from-migration-functions.patch
page-migration-cleanup-pass-mapping-to-migration-functions.patch
page-migration-cleanup-move-fallback-handling-into-special-function.patch
swapless-pm-add-r-w-migration-entries.patch
swapless-page-migration-rip-out-swap-based-logic.patch
swapless-page-migration-modify-core-logic.patch
more-page-migration-do-not-inc-dec-rss-counters.patch
more-page-migration-use-migration-entries-for-file-pages.patch
page-migration-update-documentation.patch
mm-remove-vm_locked-before-remap_pfn_range-and-drop-vm_shm.patch
page-migration-simplify-migrate_pages.patch
page-migration-simplify-migrate_pages-tweaks.patch
page-migration-handle-freeing-of-pages-in-migrate_pages.patch
page-migration-use-allocator-function-for-migrate_pages.patch
page-migration-support-moving-of-individual-pages.patch
page-migration-detailed-status-for-moving-of-individual-pages.patch
page-migration-support-moving-of-individual-pages-fixes.patch
page-migration-support-moving-of-individual-pages-x86_64-support.patch
page-migration-support-moving-of-individual-pages-x86-support.patch
page-migration-support-a-vma-migration-function.patch
allow-migration-of-mlocked-pages.patch
zoned-vm-counters-per-zone-counter-functionality.patch
zoned-vm-counters-include-per-zone-counters-in-proc-vmstat.patch
zoned-vm-counters-conversion-of-nr_mapped-to-per-zone-counter.patch
zoned-vm-counters-conversion-of-nr_pagecache-to-per-zone-counter.patch
zoned-vm-counters-use-per-zone-counters-to-remove-zone_reclaim_interval.patch
zoned-vm-counters-add-per-zone-counters-to-zone-node-and-global-vm-statistics.patch
zoned-vm-counters-conversion-of-nr_slab-to-per-zone-counter.patch
zoned-vm-counters-conversion-of-nr_pagetable-to-per-zone-counter.patch
zoned-vm-counters-conversion-of-nr_dirty-to-per-zone-counter.patch
zoned-vm-counters-conversion-of-nr_writeback-to-per-zone-counter.patch
zoned-vm-counters-conversion-of-nr_unstable-to-per-zone-counter.patch
zoned-vm-counters-remove-unused-get_page_stat-functions.patch
zoned-vm-counters-conversion-of-nr_bounce-to-per-zone-counter.patch
zoned-vm-counters-remove-useless-writeback-structure.patch
zoned-vm-stats-remove-nr_mapped-from-zone-reclaim.patch
zoned-vm-stats-add-nr_anon.patch
light-weight-counters-framework.patch
light-weight-counters-framework-s390-fix.patch
light-weight-counters-framework-s390-fix-fix.patch
light-weight-counters-framework-s390-fix-fix-fix.patch
light-weight-counters-framework-arm-fix.patch
light-weight-counters-framework-uml-fix.patch
cpuset-remove-extra-cpuset_zone_allowed-check-in-__alloc_pages.patch
swap_prefetch-conversion-of-nr_mapped-to-per-zone-counter.patch
swap_prefetch-conversion-of-nr_slab-to-per-zone-counter.patch
swap_prefetch-conversion-of-nr_dirty-to-per-zone-counter.patch
swap_prefetch-conversion-of-nr_writeback-to-per-zone-counter.patch
swap_prefetch-conversion-of-nr_unstable-to-per-zone-counter.patch
swap_prefetch-remove-unused-get_page_stat-functions.patch
zoned-vm-stats-nr_slab-is-accurate-fix-comment.patch
swap_prefetch-zoned-vm-stats-add-nr_anon.patch
reiser4-conversion-of-nr_dirty-to-per-zone-counter.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
