diff options
author | Vivek Goyal <vgoyal@in.ibm.com> | 2007-05-02 13:27:07 -0400 |
---|---|---|
committer | Andi Kleen <andi@basil.nowhere.org> | 2007-05-02 13:27:07 -0400 |
commit | 49c3df6aaa6a51071fc135273d1a2515d019099f (patch) | |
tree | cbd2fb611d14c9c859f7f417dfafae36ebebe29b /arch/x86_64 | |
parent | cfd243d4af7c7f8f52f5cb99d3932d9074b039ff (diff) |
[PATCH] x86: Move swsusp __pa() dependent code to arch portion
o __pa() should be used only on kernel linearly mapped virtual addresses
and not on kernel text and data addresses.
o Hibernation code needs to determine the physical address associated
with kernel symbol to mark a section boundary which contains pages which
don't have to be saved and restored during hibernate/resume operation.
o Move this piece of code in arch dependent section. So that architectures
which don't have kernel text/data mapped into kernel linearly mapped
region can come up with their own ways of determining physical addresses
associated with a kernel text.
Signed-off-by: Vivek Goyal <vgoyal@in.ibm.com>
Signed-off-by: Andi Kleen <ak@suse.de>
Diffstat (limited to 'arch/x86_64')
-rw-r--r-- | arch/x86_64/kernel/suspend.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/arch/x86_64/kernel/suspend.c b/arch/x86_64/kernel/suspend.c index fe865ea4df52..4ca523d58a5b 100644 --- a/arch/x86_64/kernel/suspend.c +++ b/arch/x86_64/kernel/suspend.c | |||
@@ -13,6 +13,9 @@ | |||
13 | #include <asm/page.h> | 13 | #include <asm/page.h> |
14 | #include <asm/pgtable.h> | 14 | #include <asm/pgtable.h> |
15 | 15 | ||
16 | /* References to section boundaries */ | ||
17 | extern const void __nosave_begin, __nosave_end; | ||
18 | |||
16 | struct saved_context saved_context; | 19 | struct saved_context saved_context; |
17 | 20 | ||
18 | unsigned long saved_context_eax, saved_context_ebx, saved_context_ecx, saved_context_edx; | 21 | unsigned long saved_context_eax, saved_context_ebx, saved_context_ecx, saved_context_edx; |
@@ -220,4 +223,15 @@ int swsusp_arch_resume(void) | |||
220 | restore_image(); | 223 | restore_image(); |
221 | return 0; | 224 | return 0; |
222 | } | 225 | } |
226 | |||
227 | /* | ||
228 | * pfn_is_nosave - check if given pfn is in the 'nosave' section | ||
229 | */ | ||
230 | |||
231 | int pfn_is_nosave(unsigned long pfn) | ||
232 | { | ||
233 | unsigned long nosave_begin_pfn = __pa_symbol(&__nosave_begin) >> PAGE_SHIFT; | ||
234 | unsigned long nosave_end_pfn = PAGE_ALIGN(__pa_symbol(&__nosave_end)) >> PAGE_SHIFT; | ||
235 | return (pfn >= nosave_begin_pfn) && (pfn < nosave_end_pfn); | ||
236 | } | ||
223 | #endif /* CONFIG_SOFTWARE_SUSPEND */ | 237 | #endif /* CONFIG_SOFTWARE_SUSPEND */ |