The patch titled Subject: swap-fix-oops-during-block-io-poll-in-swapin-path-fix has been removed from the -mm tree. Its filename was swap-fix-oops-during-block-io-poll-in-swapin-path-fix.patch This patch was dropped because it was folded into swap-fix-oops-during-block-io-poll-in-swapin-path.patch ------------------------------------------------------ From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> Subject: swap-fix-oops-during-block-io-poll-in-swapin-path-fix add comment Cc: Huang Ying <ying.huang@xxxxxxxxx> Cc: Hugh Dickins <hughd@xxxxxxxxxx> Cc: Jens Axboe <axboe@xxxxxx> Cc: Shaohua Li <shli@xxxxxx> Cc: Tetsuo Handa <penguin-kernel@xxxxxxxxxxxxxxxxxxx> Cc: Tim Chen <tim.c.chen@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- mm/page_io.c | 4 ++++ 1 file changed, 4 insertions(+) diff -puN mm/page_io.c~swap-fix-oops-during-block-io-poll-in-swapin-path-fix mm/page_io.c --- a/mm/page_io.c~swap-fix-oops-during-block-io-poll-in-swapin-path-fix +++ a/mm/page_io.c @@ -380,6 +380,10 @@ int swap_readpage(struct page *page, boo goto out; } bdev = bio->bi_bdev; + /* + * Keep this task valid during swap readpage because the oom killer may + * attempt to access it in the page fault retry time check. + */ get_task_struct(current); bio->bi_private = current; bio_set_op_attrs(bio, REQ_OP_READ, 0); _ Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are i-need-old-gcc.patch swap-fix-oops-during-block-io-poll-in-swapin-path.patch arm-arch-arm-include-asm-pageh-needs-personalityh.patch ocfs2-old-mle-put-and-release-after-the-function-dlm_add_migration_mle-called-fix.patch ocfs2-dlm-optimization-of-code-while-free-dead-node-locks-checkpatch-fixes.patch mm.patch mm-memory_hotplug-just-build-zonelist-for-new-added-node-fix.patch mm-memory_hotplug-just-build-zonelist-for-new-added-node-fix-fix.patch mm-thp-enable-thp-migration-in-generic-path-fix-fix.patch zsmalloc-zs_page_migrate-skip-unnecessary-loops-but-not-return-ebusy-if-zspage-is-not-inuse-fix.patch nvdimm-avoid-bogus-wmaybe-uninitialized-warning-fix.patch treewide-remove-gfp_temporary-allocation-flag-fix.patch treewide-remove-gfp_temporary-allocation-flag-checkpatch-fixes.patch kernel-reboot-add-devm_register_reboot_notifier-fix.patch linux-next-rejects.patch kernel-forkc-export-kernel_thread-to-modules.patch slab-leaks3-default-y.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