Re: swsusp updates

[Pavel Machek <pavel@ucw.cz>]

Hi!

> > Here are swsusp updates, retransmitted. Please apply this time.
> 
> With CONFIG_SOFTWARE_SUSPEND=n:
> 
> kernel/suspend.c: In function `prepare_suspend_console':
> kernel/suspend.c:272: `orig_loglevel' undeclared (first use in this function)
> kernel/suspend.c:272: (Each undeclared identifier is reported only once
> kernel/suspend.c:272: for each function it appears in.)
> kernel/suspend.c:273: `new_loglevel' undeclared (first use in this function)
> kernel/suspend.c:276: `orig_fgconsole' undeclared (first use in this function)
> kernel/suspend.c: In function `restore_console':
> kernel/suspend.c:297: `orig_loglevel' undeclared (first use in this
function)

This should fix it: (incremental).
								Pavel

--- /usr/src/tmp/linux/kernel/suspend.c	2003-08-05 00:02:29.000000000 +0200
+++ /usr/src/linux/kernel/suspend.c	2003-08-04 23:55:07.000000000 +0200
@@ -69,15 +69,6 @@
 
 unsigned char software_suspend_enabled = 0;
 
-#define SUSPEND_CONSOLE	(MAX_NR_CONSOLES-1)
-/* With SUSPEND_CONSOLE defined, it suspend looks *really* cool, but
-   we probably do not take enough locks for switching consoles, etc,
-   so bad things might happen.
-*/
-#if !defined(CONFIG_VT) || !defined(CONFIG_VT_CONSOLE)
-#undef SUSPEND_CONSOLE
-#endif
-
 #define __ADDRESS(x)  ((unsigned long) phys_to_virt(x))
 #define ADDRESS(x) __ADDRESS((x) << PAGE_SHIFT)
 #define ADDRESS2(x) __ADDRESS(__pa(x))		/* Needed for x86-64 where some pages are in memory twice */
@@ -91,9 +82,6 @@
 spinlock_t suspend_pagedir_lock __nosavedata = SPIN_LOCK_UNLOCKED;
 
 /* Variables to be preserved over suspend */
-static int new_loglevel = 7;
-static int orig_loglevel = 0;
-static int orig_fgconsole, orig_kmsg;
 static int pagedir_order_check;
 static int nr_copy_pages_check;
 
@@ -267,6 +255,19 @@
 	MDELAY(500);
 }
 
+#define SUSPEND_CONSOLE	(MAX_NR_CONSOLES-1)
+/* With SUSPEND_CONSOLE defined, it suspend looks *really* cool, but
+   we probably do not take enough locks for switching consoles, etc,
+   so bad things might happen.
+*/
+#if !defined(CONFIG_VT) || !defined(CONFIG_VT_CONSOLE)
+#undef SUSPEND_CONSOLE
+#endif
+
+static int new_loglevel = 7;
+static int orig_loglevel = 0;
+static int orig_fgconsole, orig_kmsg;
+
 int prepare_suspend_console(void)
 {
 	orig_loglevel = console_loglevel;


-- 
When do you have a heart between your knees?
[Johanka's followup: and *two* hearts?]