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 /include/asm-i386/suspend.h | |
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 'include/asm-i386/suspend.h')
-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 @@ | |||
6 | #include <asm/desc.h> | 6 | #include <asm/desc.h> |
7 | #include <asm/i387.h> | 7 | #include <asm/i387.h> |
8 | 8 | ||
9 | static inline int | 9 | static inline int arch_prepare_suspend(void) { return 0; } |
10 | arch_prepare_suspend(void) | ||
11 | { | ||
12 | /* If you want to make non-PSE machine work, turn off paging | ||
13 | in swsusp_arch_suspend. swsusp_pg_dir should have identity mapping, so | ||
14 | it could work... */ | ||
15 | if (!cpu_has_pse) { | ||
16 | printk(KERN_ERR "PSE is required for swsusp.\n"); | ||
17 | return -EPERM; | ||
18 | } | ||
19 | return 0; | ||
20 | } | ||
21 | 10 | ||
22 | /* image of the saved processor state */ | 11 | /* image of the saved processor state */ |
23 | struct saved_context { | 12 | struct saved_context { |