The patch titled vmscan-change-shrink_slab-interfaces-by-passing-shrink_control-fix has been removed from the -mm tree. Its filename was vmscan-change-shrink_slab-interfaces-by-passing-shrink_control-fix.patch This patch was dropped because it was folded into vmscan-change-shrink_slab-interfaces-by-passing-shrink_control.patch The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: vmscan-change-shrink_slab-interfaces-by-passing-shrink_control-fix From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> Cc: Dave Hansen <dave@xxxxxxxxxxxxxxxxxx> Cc: Hugh Dickins <hughd@xxxxxxxxxx> Cc: Johannes Weiner <hannes@xxxxxxxxxxx> Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@xxxxxxxxxxxxxx> Cc: KOSAKI Motohiro <kosaki.motohiro@xxxxxxxxxxxxxx> Cc: Mel Gorman <mel@xxxxxxxxx> Cc: Minchan Kim <minchan.kim@xxxxxxxxx> Cc: Pavel Emelyanov <xemul@xxxxxxxxxx> Cc: Rik van Riel <riel@xxxxxxxxxx> Cc: Ying Han <yinghan@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- mm/memory-failure.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff -puN mm/memory-failure.c~vmscan-change-shrink_slab-interfaces-by-passing-shrink_control-fix mm/memory-failure.c --- a/mm/memory-failure.c~vmscan-change-shrink_slab-interfaces-by-passing-shrink_control-fix +++ a/mm/memory-failure.c @@ -239,7 +239,12 @@ void shake_page(struct page *p, int acce if (access) { int nr; do { - nr = shrink_slab(1000, GFP_KERNEL, 1000); + struct shrink_control shrink = { + .gfp_mask = GFP_KERNEL, + .nr_scanned = 1000, + }; + + nr = shrink_slab(&shrink, 1000); if (page_count(p) == 1) break; } while (nr > 10); _ Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are origin.patch drivers-video-backlight-adp5520_blc-check-strict_strtoul-return-value.patch mm-nommu-sort-mm-mmap-list-properly.patch mm-per-node-vmstat-show-proper-vmstats.patch mm-mem-hotplug-update-pcp-stat_threshold-when-memory-hotplug-occur.patch mm-mmu_gather-rework.patch mm-uninline-large-generic-tlbh-functions.patch mm-convert-mm-cpu_vm_cpumask-into-cpumask_var_t.patch vmscan-change-shrink_slab-interfaces-by-passing-shrink_control.patch vmscan-change-shrink_slab-interfaces-by-passing-shrink_control-fix-2.patch vmscan-change-shrinker-api-by-passing-shrink_control-struct-fix.patch vmscan-change-shrinker-api-by-passing-shrink_control-struct-fix-2.patch vmscan-change-shrinker-api-by-passing-shrink_control-struct-fix-4-fix.patch vmscan-change-shrinker-api-by-passing-shrink_control-struct-fix-4-fix-fix.patch mm-filter-unevictable-page-out-in-deactivate_page-fix.patch mm-filter-unevictable-page-out-in-deactivate_page-fix-fix.patch nommu-add-page-alignment-to-mmap-checkpatch-fixes.patch alpha-hook-up-gpiolib-support-fix.patch cris-convert-old-cpumask-api-into-new-one-checkpatch-fixes.patch bitmap-irq-add-smp_affinity_list-interface-to-proc-irq-fix.patch init-calibratec-fix-for-critical-bogomips-intermittent-calculation-failure-checkpatch-fixes.patch init-calibratec-fix-for-critical-bogomips-intermittent-calculation-failure-fix.patch printk-allocate-kernel-log-buffer-earlier-v2-checkpatch-fixes.patch printk-allocate-kernel-log-buffer-earlier-v2-fix.patch drivers-leds-leds-lm3530c-add-regulator-checkpatch-fixes.patch leds-provide-helper-to-register-leds-gpio-devices.patch lru_cache-use-correct-type-in-sizeof-for-allocation-fix.patch percpu_counter-change-return-value-and-add-comments-fix.patch fs-ncpfs-inodec-suppress-used-uninitialised-warning.patch drivers-gpio-vx855_gpioc-needs-slabh.patch drivers-gpio-ml_ioh_gpioc-needs-slabh.patch drivers-tty-serial-pch_uartc-needs-slabh.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