Unverified Commit b670dd90 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!5269 printk: avoid deadlock in panic 

Merge Pull Request from: @ci-robot 
 
PR sync from: Ye Weihua <yeweihua4@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/TI3L6OEIPKUU4EM2XWCX3K6DQY3OFO5W/ 
 
https://gitee.com/openeuler/kernel/issues/I991OV 
 
Link:https://gitee.com/openeuler/kernel/pulls/5269

 

Reviewed-by: default avatarXu Kuohai <xukuohai@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents 459341c4 bd0b7dc4

kernel/printk/printk.c

+2 −2
Original line number Diff line number Diff line
@@ -2609,12 +2609,12 @@ void console_unlock(void) 
			return;

		}



		printk_safe_exit_irqrestore(flags);



		/* Allow panic_cpu to take over the consoles safely */

		if (abandon_console_lock_in_panic())

			break;



		printk_safe_exit_irqrestore(flags);



		if (do_cond_resched)

			cond_resched();

	}