The patch titled ZVC writeback: Fix mm and other issues has been added to the -mm tree. Its filename is mm-implement-swap-prefetching-vs-zvc-stuff.patch *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: ZVC writeback: Fix mm and other issues From: Christoph Lameter <clameter@xxxxxxx> This deals with swap prefetch and various things changed in mm. Signed-off-by: Christoph Lameter <clameter@xxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxx> --- mm/swap_prefetch.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff -puN mm/swap_prefetch.c~mm-implement-swap-prefetching-vs-zvc-stuff mm/swap_prefetch.c --- a/mm/swap_prefetch.c~mm-implement-swap-prefetching-vs-zvc-stuff +++ a/mm/swap_prefetch.c @@ -280,7 +280,7 @@ static void examine_free_limits(void) z->lowmem_reserve[ZONE_HIGHMEM]; ns->highfree[idx] = ns->lowfree[idx] + z->pages_high; - if (z->free_pages > ns->highfree[idx]) { + if (zone_page_state(z, NR_FREE_PAGES) > ns->highfree[idx]) { /* * We've gotten above the high watermark of free pages * so we can start prefetching till we get to the low @@ -337,7 +337,7 @@ static int prefetch_suitable(void) ns = &sp_stat.node[node]; idx = zone_idx(z); - free = z->free_pages; + free = zone_page_state(z, NR_FREE_PAGES); if (free < *ns->pointfree[idx]) { /* * Free pages have dropped below the low watermark so _ Patches currently in -mm which might be from clameter@xxxxxxx are slab-cache_grow-cleanup.patch use-zvc-for-inactive-and-active-counts.patch use-zvc-for-free_pages.patch use-zvc-for-free_pages-fix.patch use-zvc-for-free_pages-fix-2.patch use-zvc-for-free_pages-fix-3.patch reorder-zvcs-according-to-cacheline.patch drop-free_pages.patch drop-nr_free_pages_pgdat.patch drop-__get_zone_counts.patch drop-get_zone_counts.patch get_dirty_limits-accurately-calculate-the-available-memory-that-can-be-dirtied.patch get_dirty_limits-accurately-calculate-the-available-memory-that-can-be-dirtied-fix.patch deal-with-cases-of-zone_dma-meaning-the-first-zone.patch introduce-config_zone_dma.patch optional-zone_dma-in-the-vm.patch optional-zone_dma-in-the-vm-no-gfp_dma-check-in-the-slab-if-no-config_zone_dma-is-set.patch optional-zone_dma-in-the-vm-no-gfp_dma-check-in-the-slab-if-no-config_zone_dma-is-set-reduce-config_zone_dma-ifdefs.patch optional-zone_dma-for-ia64.patch remove-zone_dma-remains-from-parisc.patch remove-zone_dma-remains-from-sh-sh64.patch set-config_zone_dma-for-arches-with-generic_isa_dma.patch zoneid-fix-up-calculations-for-zoneid_pgshift.patch replace-highest_possible_node_id-with-nr_node_ids.patch mm-only-sched-add-a-few-scheduler-event-counters.patch mm-implement-swap-prefetching-vs-zvc-stuff.patch zvc-support-nr_slab_reclaimable--nr_slab_unreclaimable-swap_prefetch.patch reduce-max_nr_zones-swap_prefetch-remove-incorrect-use-of-zone_highmem.patch numa-add-zone_to_nid-function-swap_prefetch.patch remove-uses-of-kmem_cache_t-from-mm-and-include-linux-slabh-prefetch.patch readahead-state-based-method-aging-accounting.patch readahead-state-based-method-aging-accounting-vs-zvc-changes.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