From patchwork Sun Feb 6 17:31:53 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mandeep Singh Baines X-Patchwork-Id: 535341 Received: from smtp1.linux-foundation.org (smtp1.linux-foundation.org [140.211.169.13]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p16HYC5x014458 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=FAIL) for ; Sun, 6 Feb 2011 17:34:38 GMT Received: from daredevil.linux-foundation.org (localhost [127.0.0.1]) by smtp1.linux-foundation.org (8.14.2/8.13.5/Debian-3ubuntu1.1) with ESMTP id p16HWGFn031861; Sun, 6 Feb 2011 09:32:17 -0800 Received: from smtp-out.google.com (smtp-out.google.com [74.125.121.67]) by smtp1.linux-foundation.org (8.14.2/8.13.5/Debian-3ubuntu1.1) with ESMTP id p16HW7tg031828 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Sun, 6 Feb 2011 09:32:10 -0800 Received: from wpaz1.hot.corp.google.com (wpaz1.hot.corp.google.com [172.24.198.65]) by smtp-out.google.com with ESMTP id p16HW60e025156 for ; Sun, 6 Feb 2011 09:32:06 -0800 Received: from pxi7 (pxi7.prod.google.com [10.243.27.7]) by wpaz1.hot.corp.google.com with ESMTP id p16HW4Ft003948 (version=TLSv1/SSLv3 cipher=RC4-MD5 bits=128 verify=NOT) for ; Sun, 6 Feb 2011 09:32:04 -0800 Received: by pxi7 with SMTP id 7so838542pxi.36 for ; Sun, 06 Feb 2011 09:32:03 -0800 (PST) Received: by 10.142.171.17 with SMTP id t17mr14184833wfe.317.1297013523651; Sun, 06 Feb 2011 09:32:03 -0800 (PST) Received: from localhost (msb.mtv.corp.google.com [172.22.72.160]) by mx.google.com with ESMTPS id w22sm4604301wfd.19.2011.02.06.09.32.01 (version=TLSv1/SSLv3 cipher=RC4-MD5); Sun, 06 Feb 2011 09:32:02 -0800 (PST) Date: Sun, 6 Feb 2011 09:31:53 -0800 From: Mandeep Singh Baines To: Greg KH Message-ID: <20110206173153.GT19745@google.com> References: <20110125235700.GR8008@google.com> <1296084570-31453-5-git-send-email-msb@chromium.org> <20110203221346.GA477@kroah.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20110203221346.GA477@kroah.com> X-Operating-System: Linux/2.6.32-gg298-generic (x86_64) User-Agent: Mutt/1.5.20 (2009-06-14) X-System-Of-Record: true Received-SPF: pass (localhost is always allowed.) X-Spam-Status: No, hits=-4.524 required=5 tests=AWL, BAYES_00, OSDL_HEADER_SPF_PASS, OSDL_HEADER_SUBJECT_BRACKETED X-Spam-Checker-Version: SpamAssassin 3.2.4-osdl_revision__1.47__ X-MIMEDefang-Filter: lf$Revision: 1.188 $ X-Scanned-By: MIMEDefang 2.63 on 140.211.169.21 Cc: gregkh@suse.de, linux-kernel@vger.kernel.org, linux-mm@kvack.org, mingo@redhat.com, linux-fsdevel@vger.kernel.org, akpm@linux-foundation.org, linux-pm@lists.linux-foundation.org Subject: [linux-pm] [PATCH v2] TTY: use appropriate printk priority level X-BeenThere: linux-pm@lists.linux-foundation.org X-Mailman-Version: 2.1.9 Precedence: list List-Id: Linux power management List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-pm-bounces@lists.linux-foundation.org Errors-To: linux-pm-bounces@lists.linux-foundation.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Sun, 06 Feb 2011 17:34:38 +0000 (UTC) diff --git a/drivers/tty/vt/vt.c b/drivers/tty/vt/vt.c index 147ede3..d5669ff 100644 --- a/drivers/tty/vt/vt.c +++ b/drivers/tty/vt/vt.c @@ -2157,10 +2157,10 @@ static int do_con_write(struct tty_struct *tty, const unsigned char *buf, int co currcons = vc->vc_num; if (!vc_cons_allocated(currcons)) { - /* could this happen? */ - printk_once("con_write: tty %d not allocated\n", currcons+1); - console_unlock(); - return 0; + /* could this happen? */ + pr_warn_once("con_write: tty %d not allocated\n", currcons+1); + console_unlock(); + return 0; } himask = vc->vc_hi_font_mask; @@ -2940,7 +2940,7 @@ static int __init con_init(void) gotoxy(vc, vc->vc_x, vc->vc_y); csi_J(vc, 0); update_screen(vc); - printk("Console: %s %s %dx%d", + pr_info("Console: %s %s %dx%d", vc->vc_can_do_color ? "colour" : "mono", display_desc, vc->vc_cols, vc->vc_rows); printable = 1; @@ -3103,7 +3103,7 @@ static int bind_con_driver(const struct consw *csw, int first, int last, clear_buffer_attributes(vc); } - printk("Console: switching "); + pr_info("Console: switching "); if (!deflt) printk("consoles %d-%d ", first+1, last+1); if (j >= 0) { @@ -3809,7 +3809,8 @@ void do_unblank_screen(int leaving_gfx) return; if (!vc_cons_allocated(fg_console)) { /* impossible */ - printk("unblank_screen: tty %d not allocated ??\n", fg_console+1); + pr_warning("unblank_screen: tty %d not allocated ??\n", + fg_console+1); return; } vc = vc_cons[fg_console].d;