diff options
| author |   Rafael J. Wysocki <rjw@sisk.pl> | 2006-12-06 20:34:29 -0800 |
|---|---|---|
| committer |   Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-07 08:39:28 -0800 |
| commit | 2d4a34c9365c6e3f94a5b26ce296e1fce9b66c8b (patch) | |
| tree | ad8303f7db40d963f7a7b120996d4fe658a43cce /include/asm-i386 | |
| parent | [PATCH] swsusp: thaw userspace and kernel space separately (diff) | |
| download | linux-dev-2d4a34c9365c6e3f94a5b26ce296e1fce9b66c8b.tar.xz linux-dev-2d4a34c9365c6e3f94a5b26ce296e1fce9b66c8b.zip | |
[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 'include/asm-i386')
| -rw-r--r-- | include/asm-i386/suspend.h | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/include/asm-i386/suspend.h b/include/asm-i386/suspend.h index 08be1e5009d4..c1da5caafaf7 100644 --- a/include/asm-i386/suspend.h +++ b/include/asm-i386/suspend.h @@ -6,18 +6,7 @@ #include <asm/desc.h> #include <asm/i387.h> -static inline int -arch_prepare_suspend(void) -{ - /* If you want to make non-PSE machine work, turn off paging - in swsusp_arch_suspend. swsusp_pg_dir should have identity mapping, so - it could work... */ - if (!cpu_has_pse) { - printk(KERN_ERR "PSE is required for swsusp.\n"); - return -EPERM; - } - return 0; -} +static inline int arch_prepare_suspend(void) { return 0; } /* image of the saved processor state */ struct saved_context { |