From 17a126875264d508eaca8f53dcd25d6de7d1dea5 Mon Sep 17 00:00:00 2001 From: Chuansheng Liu Date: Tue, 18 Sep 2012 01:43:44 +0800 Subject: [PATCH] --- yaml --- r: 330533 b: refs/heads/master c: 80c9d03c22f13a17df67b4b99a83ed5e9acf6093 h: refs/heads/master i: 330531: 981a58517f4de87c49e9b4f75d851043324119fc v: v3 --- [refs] | 2 +- trunk/fs/pstore/platform.c | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index c2979b09f015..eaa36a148f2f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 65f8c95e46a1827ae8bbc52a817ea308dd7d65ae +refs/heads/master: 80c9d03c22f13a17df67b4b99a83ed5e9acf6093 diff --git a/trunk/fs/pstore/platform.c b/trunk/fs/pstore/platform.c index 6c23eab7f76c..a40da07e93d6 100644 --- a/trunk/fs/pstore/platform.c +++ b/trunk/fs/pstore/platform.c @@ -164,7 +164,13 @@ static void pstore_console_write(struct console *con, const char *s, unsigned c) if (c > psinfo->bufsize) c = psinfo->bufsize; - spin_lock_irqsave(&psinfo->buf_lock, flags); + + if (oops_in_progress) { + if (!spin_trylock_irqsave(&psinfo->buf_lock, flags)) + break; + } else { + spin_lock_irqsave(&psinfo->buf_lock, flags); + } memcpy(psinfo->buf, s, c); psinfo->write(PSTORE_TYPE_CONSOLE, 0, NULL, 0, c, psinfo); spin_unlock_irqrestore(&psinfo->buf_lock, flags);