diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2006-12-06 23:34:29 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-07 11:39:28 -0500 |
| commit | 2d4a34c9365c6e3f94a5b26ce296e1fce9b66c8b (patch) | |
| tree | ad8303f7db40d963f7a7b120996d4fe658a43cce /kernel/power/Kconfig | |
| parent | ff39593ad0ff7a79a3717edac6634407aa8200c2 (diff) | |
[PATCH] swsusp: Support i386 systems with PAE or without PSE
Make swsusp support i386 systems with PAE or without PSE.
This is done by creating temporary page tables located in resume-safe page
frames before the suspend image is restored in the same way as x86_64 does
it.
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Cc: Andi Kleen <ak@suse.de>
Cc: Dave Jones <davej@redhat.com>
Cc: Nigel Cunningham <ncunningham@linuxmail.org>
Cc: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'kernel/power/Kconfig')
| -rw-r--r-- | kernel/power/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/power/Kconfig b/kernel/power/Kconfig index 825068ca347..710ed084e7c 100644 --- a/kernel/power/Kconfig +++ b/kernel/power/Kconfig | |||
| @@ -78,7 +78,7 @@ config PM_SYSFS_DEPRECATED | |||
| 78 | 78 | ||
| 79 | config SOFTWARE_SUSPEND | 79 | config SOFTWARE_SUSPEND |
| 80 | bool "Software Suspend" | 80 | bool "Software Suspend" |
| 81 | depends on PM && SWAP && ((X86 && (!SMP || SUSPEND_SMP) && !X86_PAE) || ((FRV || PPC32) && !SMP)) | 81 | depends on PM && SWAP && ((X86 && (!SMP || SUSPEND_SMP)) || ((FRV || PPC32) && !SMP)) |
| 82 | ---help--- | 82 | ---help--- |
| 83 | Enable the possibility of suspending the machine. | 83 | Enable the possibility of suspending the machine. |
| 84 | It doesn't need ACPI or APM. | 84 | It doesn't need ACPI or APM. |