linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Mandeep Singh Baines <msb@chromium.org>
To: linux-kernel@vger.kernel.org
Cc: Mandeep Singh Baines <msb@chromium.org>,
	Andrew Morton <akpm@linux-foundation.org>,
	Huang Ying <ying.huang@intel.com>,
	Andi Kleen <ak@linux.intel.com>,
	Hugh Dickins <hughd@chromium.org>, Olaf Hering <olaf@aepfle.de>,
	Jesse Barnes <jbarnes@virtuousgeek.org>,
	Dave Airlie <airlied@gmail.com>
Subject: [PATCH 2/2] panic: do not unblank_screen when panic_timeout < 0
Date: Mon, 20 Jun 2011 16:22:09 -0700	[thread overview]
Message-ID: <1308612129-12488-2-git-send-email-msb@chromium.org> (raw)
In-Reply-To: <1308612129-12488-1-git-send-email-msb@chromium.org>

Avoid risk (of screen_unblank) and wasted cycles unblanking if
you intend to reboot immediately.

Signed-off-by: Mandeep Singh Baines <msb@chromium.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Huang Ying <ying.huang@intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Hugh Dickins <hughd@chromium.org>
Cc: Olaf Hering <olaf@aepfle.de>
Cc: Jesse Barnes <jbarnes@virtuousgeek.org>
Cc: Dave Airlie <airlied@gmail.com>
---
 lib/bust_spinlocks.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/lib/bust_spinlocks.c b/lib/bust_spinlocks.c
index 9681d54..6a5c7e0 100644
--- a/lib/bust_spinlocks.c
+++ b/lib/bust_spinlocks.c
@@ -21,7 +21,8 @@ void __attribute__((weak)) bust_spinlocks(int yes)
 		++oops_in_progress;
 	} else {
 #ifdef CONFIG_VT
-		unblank_screen();
+		if (panic_timeout >= 0)
+			unblank_screen();
 #endif
 		console_unblank();
 		if (--oops_in_progress == 0)
-- 
1.7.3.1


  reply	other threads:[~2011-06-20 23:25 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-06-20 23:22 [PATCH 1/2] panic: panic=-1 for immediate reboot Mandeep Singh Baines
2011-06-20 23:22 ` Mandeep Singh Baines [this message]
2011-06-22 22:30   ` [PATCH] panic, vt: do not force oops output when panic_timeout < 0 Mandeep Singh Baines
2011-07-06 23:33     ` Andrew Morton
2011-07-15 22:57       ` Mandeep Singh Baines
2011-07-07  7:53     ` Alan Cox
2011-07-15 21:39       ` Mandeep Singh Baines
2011-07-15 23:17         ` Alan Cox
2011-06-22  9:39 ` [PATCH 1/2] panic: panic=-1 for immediate reboot Olaf Hering
2011-06-22 22:17   ` Mandeep Singh Baines

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1308612129-12488-2-git-send-email-msb@chromium.org \
    --to=msb@chromium.org \
    --cc=airlied@gmail.com \
    --cc=ak@linux.intel.com \
    --cc=akpm@linux-foundation.org \
    --cc=hughd@chromium.org \
    --cc=jbarnes@virtuousgeek.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=olaf@aepfle.de \
    --cc=ying.huang@intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).