History

[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).

Pavel Machek committed 20 years ago

Commit 471b40d1 parent 96dd7421 file · +5 −1Browse files

Showing the changes to kernel (1 of 1 file). Show all

Unified · Split

kernel/power/Kconfig+5−1
@@ -56,7 +56,7 @@ config PM_TRACE · 55 unmodified lines
5656
5757 config SOFTWARE_SUSPEND
5858 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))
6060 ---help---
6161 Enable the possibility of suspending the machine.
6262 It doesn't need ACPI or APM.
@@ -78,6 +78,10 @@ config SOFTWARE_SUSPEND · 15 unmodified lines
7878
7979 For more information take a look at <file:Documentation/power/swsusp.txt>.
8080
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).
84+
8185 config PM_STD_PARTITION
8286 string "Default resume partition"
8387 depends on SOFTWARE_SUSPEND