public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH 1/1] Power: fix suspend vt regression
@ 2009-08-11  8:41 Jiri Slaby
  2009-08-11 17:00 ` Greg KH
  0 siblings, 1 reply; 22+ messages in thread
From: Jiri Slaby @ 2009-08-11  8:41 UTC (permalink / raw)
  To: gregkh; +Cc: linux-kernel, Jiri Slaby, Alan Cox, Rafael J. Wysocki

vt_waitactive no longer accepts console parameter as console-1
since commit "vt: add an event interface". It expects console
number directly (as viewed by userspace -- counting from 1).

Fix a deadlock suspend regression by redefining SUSPEND_CONSOLE
to be MAX_NR_CONSOLES, not MAX_NR_CONSOLES-1.

Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
Cc: Alan Cox <alan@linux.intel.com>
Cc: Greg Kroah-Hartman <gregkh@suse.de>
Cc: "Rafael J. Wysocki" <rjw@sisk.pl>
---
 kernel/power/console.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/kernel/power/console.c b/kernel/power/console.c
index 5187136..6592a57 100644
--- a/kernel/power/console.c
+++ b/kernel/power/console.c
@@ -11,7 +11,7 @@
 #include "power.h"
 
 #if defined(CONFIG_VT) && defined(CONFIG_VT_CONSOLE)
-#define SUSPEND_CONSOLE	(MAX_NR_CONSOLES-1)
+#define SUSPEND_CONSOLE	MAX_NR_CONSOLES
 
 static int orig_fgconsole, orig_kmsg;
 
-- 
1.6.3.3


^ permalink raw reply related	[flat|nested] 22+ messages in thread

end of thread, other threads:[~2009-09-11  7:55 UTC | newest]

Thread overview: 22+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-08-11  8:41 [PATCH 1/1] Power: fix suspend vt regression Jiri Slaby
2009-08-11 17:00 ` Greg KH
2009-08-11 21:19   ` Jiri Slaby
2009-08-11 21:20     ` Jiri Slaby
2009-08-31  9:47     ` suspend race -next regression [Was: Power: fix suspend vt regression] Jiri Slaby
2009-08-31 19:32       ` Rafael J. Wysocki
2009-09-04 11:49         ` suspend race -mm " Jiri Slaby
2009-09-04 22:30           ` Jiri Slaby
2009-09-04 22:36             ` Jiri Slaby
2009-09-05 12:39               ` [-mm] warning during suspend [was: suspend race -mm regression] Jiri Slaby
2009-09-05 14:41                 ` Xiao Guangrong
2009-09-10 20:57                   ` Andrew Morton
2009-09-11  0:00                     ` Suresh Siddha
2009-09-11  7:55                       ` Xiao Guangrong
2009-09-09 11:41           ` [PATCH 1/1] sched: fix cpu_down deadlock Jiri Slaby
2009-09-09 11:53             ` Peter Zijlstra
2009-09-09 12:23               ` Jiri Slaby
2009-09-09 12:37                 ` Peter Zijlstra
2009-09-09 13:46                 ` Oleg Nesterov
2009-09-11  6:09             ` Lai Jiangshan
2009-09-11  6:28               ` Jiri Slaby
2009-09-11  7:38                 ` Lai Jiangshan

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox