Messages in this thread Patch in this message | | | From | Jiri Slaby <> | Subject | [PATCH 1/1] Power: fix suspend vt regression | Date | Tue, 11 Aug 2009 10:41:33 +0200 |
| |
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
| |