]> err.no Git - linux-2.6/commitdiff
[PATCH] swsusp: only allow it when it makes sense
authorPavel Machek <pavel@ucw.cz>
Sat, 25 Jun 2005 21:55:17 +0000 (14:55 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Sat, 25 Jun 2005 23:24:34 +0000 (16:24 -0700)
Show swsuspend only on .config where it can compile.  I got this on PPC32 &&
SMP:

kernel/power/smp.c:24: error: storage size of `ctxt' isn't known

Also mark swsusp as no longer experimental.

Signed-off-by: Olaf Hering <olh@suse.de>
Signed-off-by: Pavel Machek <pavel@suse.cz>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
kernel/power/Kconfig

index fdb377636505f116b906165e348b9759951645f4..2c7121d9bff11aff162a578bd68d7934c1030104 100644 (file)
@@ -27,8 +27,8 @@ config PM_DEBUG
        like suspend support.
 
 config SOFTWARE_SUSPEND
-       bool "Software Suspend (EXPERIMENTAL)"
-       depends on EXPERIMENTAL && PM && SWAP && (SUSPEND_SMP || !SMP)
+       bool "Software Suspend"
+       depends on EXPERIMENTAL && PM && SWAP && ((X86 && SMP) || ((FVR || PPC32 || X86) && !SMP))
        ---help---
          Enable the possibility of suspending the machine.
          It doesn't need APM.