Commit 3b3add16 authored by Pavel Machek's avatar Pavel Machek Committed by Linus Torvalds

[PATCH] swsusp fails to suspend if CONFIG_DEBUG_PAGEALLOC is also enabled

swsusp low-level assembly requires PSE (4mb pages for kernel) and
DEBUG_PAGEALLOC disables that capability.

Tell people what went wrong, some people seen same problem on VIA cpus...
Signed-off-by: default avatarPavel Machek <pavel@suse.cz>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 7d849dea
......@@ -10,10 +10,12 @@ static inline int
arch_prepare_suspend(void)
{
/* If you want to make non-PSE machine work, turn off paging
in do_magic. swsusp_pg_dir should have identity mapping, so
in swsusp_arch_suspend. swsusp_pg_dir should have identity mapping, so
it could work... */
if (!cpu_has_pse)
if (!cpu_has_pse) {
printk(KERN_ERR "PSE is required for swsusp.\n");
return -EPERM;
}
return 0;
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment