Subject: [folded-merged] printk-release-lockbuf_lock-before-calling-console_trylock_for_printk-fix.patch removed from -mm tree To: akpm@xxxxxxxxxxxxxxxxxxxx,jack@xxxxxxx,mm-commits@xxxxxxxxxxxxxxx From: akpm@xxxxxxxxxxxxxxxxxxxx Date: Wed, 04 Jun 2014 15:53:08 -0700 The patch titled Subject: printk-release-lockbuf_lock-before-calling-console_trylock_for_printk-fix has been removed from the -mm tree. Its filename was printk-release-lockbuf_lock-before-calling-console_trylock_for_printk-fix.patch This patch was dropped because it was folded into printk-release-lockbuf_lock-before-calling-console_trylock_for_printk.patch ------------------------------------------------------ From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> Subject: printk-release-lockbuf_lock-before-calling-console_trylock_for_printk-fix fix have_callable_console() comment Cc: Jan Kara <jack@xxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- kernel/printk/printk.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff -puN kernel/printk/printk.c~printk-release-lockbuf_lock-before-calling-console_trylock_for_printk-fix kernel/printk/printk.c --- a/kernel/printk/printk.c~printk-release-lockbuf_lock-before-calling-console_trylock_for_printk-fix +++ a/kernel/printk/printk.c @@ -1377,7 +1377,10 @@ static void zap_locks(void) sema_init(&console_sem, 1); } -/* Check if we have any console registered that can be called early in boot. */ +/* + * Check if we have any console that is capable of printing while cpu is + * booting or shutting down. Requires console_sem. + */ static int have_callable_console(void) { struct console *con; _ Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are origin.patch arch-unicore32-mm-ioremapc-convert-printk-warn_on-to-warn1.patch arch-unicore32-mm-ioremapc-return-null-on-invalid-pfn.patch ocfs2-limit-printk-when-journal-is-aborted.patch fs-add-generic-data-flush-to-fsync.patch mm-huge_memoryc-complete-conversion-to-pr_foo.patch include-linux-mmdebugh-add-vm_warn_on-and-vm_warn_on_once.patch mm-mempool-warn-about-__gfp_zero-usage.patch mm-pass-vm_bug_on-reason-to-dump_page.patch hugetlb-add-support-for-gigantic-page-allocation-at-runtime.patch fs-hugetlbfs-inodec-complete-conversion-to-pr_foo.patch mm-compaction-cleanup-isolate_freepages.patch arc-call-find_vma-with-the-mmap_sem-held.patch mm-vmscan-do-not-throttle-based-on-pfmemalloc-reserves-if-node-has-no-zone_normal.patch swap-use-bdev_read_page-bdev_write_page.patch mm-update-comment-for-default_max_map_count.patch memcg-fold-mem_cgroup_stolen.patch mm-compaction-embed-migration-mode-in-compact_control.patch mm-add-comment-for-__mod_zone_page_stat.patch mm-fold-mlocked_vma_newpage-into-its-only-call-site.patch fs-buffer-do-not-use-unnecessary-atomic-operations-when-discarding-buffers.patch mm-non-atomically-mark-page-accessed-during-page-cache-allocation-where-possible.patch mm-compaction-properly-signal-and-act-upon-lock-and-need_sched-contention.patch mm-document-do_fault_around-feature.patch mm-memory-failurec-support-dedicated-thread-to-handle-sigbusbus_mceerr_ao.patch kernel-res_counterc-replace-simple_strtoull-by-kstrtoull.patch printk-release-lockbuf_lock-before-calling-console_trylock_for_printk.patch lib-btreec-fix-leak-of-whole-btree-nodes-fix.patch init-mainc-dont-use-pr_debug.patch init-mainc-add-initcall_blacklist-kernel-parameter-fix.patch init-mainc-remove-an-ifdef.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