Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
[PATCH] prevent swsusp with PAE
PAE + swsusp results in hard-to-debug crash about 50% of time during
resume. Cause is known, fix needs to be ported from x86-64 (but we can't
make it to 2.6.18, and I'd like this to be worked around in 2.6.18).
Signed-off-by: Pavel Machek <pavel@suse.cz>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
authored by Pavel Machek and committed by Linus Torvalds 471b40d0 96dd7421
+5
-1
kernel/power/Kconfig
+5
-1
kernel/power/Kconfig
···
56
56
57
57
config SOFTWARE_SUSPEND
58
58
bool "Software Suspend"
59
-
depends on PM && SWAP && (X86 && (!SMP || SUSPEND_SMP)) || ((FRV || PPC32) && !SMP)
59
+
depends on PM && SWAP && ((X86 && (!SMP || SUSPEND_SMP) && !X86_PAE) || ((FRV || PPC32) && !SMP))
60
60
---help---
61
61
Enable the possibility of suspending the machine.
62
62
It doesn't need ACPI or APM.
···
77
77
on disk won't match with saved ones.
78
78
79
79
For more information take a look at <file:Documentation/power/swsusp.txt>.
80
+
81
+
(For now, swsusp is incompatible with PAE aka HIGHMEM_64G on i386.
82
+
we need identity mapping for resume to work, and that is trivial
83
+
to get with 4MB pages, but less than trivial on PAE).
80
84
81
85
config PM_STD_PARTITION
82
86
string "Default resume partition"