The patch titled mm-vmscan-reclaim-order-0-and-use-compaction-instead-of-lumpy-reclaim-avoid-a-potential-deadlock-due-to-lock_page-during-direct-compaction-fix has been removed from the -mm tree. Its filename was mm-vmscan-reclaim-order-0-and-use-compaction-instead-of-lumpy-reclaim-avoid-a-potential-deadlock-due-to-lock_page-during-direct-compaction-fix.patch This patch was dropped because it was folded into mm-vmscan-reclaim-order-0-and-use-compaction-instead-of-lumpy-reclaim.patch The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: mm-vmscan-reclaim-order-0-and-use-compaction-instead-of-lumpy-reclaim-avoid-a-potential-deadlock-due-to-lock_page-during-direct-compaction-fix From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> use conventional task_struct naming Cc: Hugh Dickins <hughd@xxxxxxxxxx> Cc: Mel Gorman <mel@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- mm/page_alloc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff -puN mm/page_alloc.c~mm-vmscan-reclaim-order-0-and-use-compaction-instead-of-lumpy-reclaim-avoid-a-potential-deadlock-due-to-lock_page-during-direct-compaction-fix mm/page_alloc.c --- a/mm/page_alloc.c~mm-vmscan-reclaim-order-0-and-use-compaction-instead-of-lumpy-reclaim-avoid-a-potential-deadlock-due-to-lock_page-during-direct-compaction-fix +++ a/mm/page_alloc.c @@ -1815,15 +1815,15 @@ __alloc_pages_direct_compact(gfp_t gfp_m int migratetype, unsigned long *did_some_progress) { struct page *page; - struct task_struct *p = current; + struct task_struct *tsk = current; if (!order || compaction_deferred(preferred_zone)) return NULL; - p->flags |= PF_MEMALLOC; + tsk->flags |= PF_MEMALLOC; *did_some_progress = try_to_compact_pages(zonelist, order, gfp_mask, nodemask); - p->flags &= ~PF_MEMALLOC; + tsk->flags &= ~PF_MEMALLOC; if (*did_some_progress != COMPACT_SKIPPED) { /* Page migration frees to the PCP lists but we want merging */ _ Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are origin.patch atmel_serial-fix-rts-high-after-initialization-in-rs485-mode.patch mm-vmstat-use-a-single-setter-function-and-callback-for-adjusting-percpu-thresholds.patch sync_inode_metadata-fix-comment.patch fs-mpagec-consolidate-code.patch mm-vmscan-reclaim-order-0-and-use-compaction-instead-of-lumpy-reclaim.patch mm-migration-allow-migration-to-operate-asynchronously-and-avoid-synchronous-compaction-in-the-faster-path-fix.patch mlock-only-hold-mmap_sem-in-shared-mode-when-faulting-in-pages-fix.patch mlock-do-not-hold-mmap_sem-for-extended-periods-of-time-fix.patch writeback-avoid-unnecessary-determine_dirtyable_memory-call-fix.patch thp-pte-alloc-trans-splitting-fix-checkpatch-fixes.patch thp-kvm-mmu-transparent-hugepage-support-bisection.patch thp-khugepaged-make-khugepaged-aware-of-madvise-fix.patch mm-migration-use-rcu_dereference_protected-when-dereferencing-the-radix-tree-slot-during-file-page-migration-fix.patch mm-hugetlbc-fix-error-path-memory-leak-in-nr_hugepages_store_common-fix.patch brk-fix-min_brk-lower-bound-computation-for-compat_brk-fix.patch mm-page_allocc-simplify-calculation-of-combined-index-of-adjacent-buddy-lists-checkpatch-fixes.patch mm-page_allocc-simplify-calculation-of-combined-index-of-adjacent-buddy-lists-fix.patch mm-dmapoolc-use-task_uninterruptible-in-dma_pool_alloc.patch hugetlb-check-the-return-value-of-string-conversion-in-sysctl-handler-fix.patch hugetlb-do-not-allow-pagesize-=-max_order-pool-adjustment-fix.patch mm-fix-migration-hangs-on-anon_vma-lock-checkpatch-fixes.patch mm-page_allocc-dont-cache-current-in-a-local.patch mm-batch-activate_page-to-reduce-lock-contention-checkpatch-fixes.patch memcg-document-cgroup-dirty-memory-interfaces-fix.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