Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751198AbdGOKhG (ORCPT ); Sat, 15 Jul 2017 06:37:06 -0400 Received: from mail-pg0-f66.google.com ([74.125.83.66]:36635 "EHLO mail-pg0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751156AbdGOKhE (ORCPT ); Sat, 15 Jul 2017 06:37:04 -0400 From: Pierre Kuo To: pmladek@suse.com Cc: sergey.senozhatsky@gmail.com, rostedt@goodmis.org, linux-kernel@vger.kernel.org, joe@perches.com, pierre Kuo Subject: [PATCH] printk: modify console_unlock with printk-safe macros Date: Sat, 15 Jul 2017 18:36:54 +0800 Message-Id: <1500115014-3420-1-git-send-email-vichy.kuo@gmail.com> X-Mailer: git-send-email 1.7.9.5 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1089 Lines: 37 From: pierre Kuo In commit de6fcbdb68b2 ("printk: convert the rest to printk-safe"), we create 4 helper macros to make printk-safe usage easier. Here we modify some part of console_unlock with above marcros. Signed-off-by: Pierre Kuo --- kernel/printk/printk.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c index fc47863..21557cc 100644 --- a/kernel/printk/printk.c +++ b/kernel/printk/printk.c @@ -2194,8 +2194,7 @@ void console_unlock(void) size_t ext_len = 0; size_t len; - printk_safe_enter_irqsave(flags); - raw_spin_lock(&logbuf_lock); + logbuf_lock_irqsave(flags); if (seen_seq != log_next_seq) { wake_klogd = true; seen_seq = log_next_seq; @@ -2267,8 +2266,7 @@ void console_unlock(void) */ raw_spin_lock(&logbuf_lock); retry = console_seq != log_next_seq; - raw_spin_unlock(&logbuf_lock); - printk_safe_exit_irqrestore(flags); + logbuf_unlock_irqrestore(flags); if (retry && console_trylock()) goto again; -- 1.7.9.5