diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-22 20:37:50 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-22 20:37:50 -0700 |
| commit | 10f2a2b0f68abf39c06cf519cbc1740fa50f900b (patch) | |
| tree | 70b33e4437ae0d5ac92f56c60b048756bde7f3e4 /arch/x86/kernel/acpi | |
| parent | 8814011679d1a47d8b0158fc991727a5859471a0 (diff) | |
| parent | b40827fa7268fda8a62490728a61c2856f33830b (diff) | |
| download | blackbird-op-linux-10f2a2b0f68abf39c06cf519cbc1740fa50f900b.tar.gz blackbird-op-linux-10f2a2b0f68abf39c06cf519cbc1740fa50f900b.zip | |
Merge branch 'x86-trampoline-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-trampoline-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86-32, mm: Add an initial page table for core bootstrapping
Diffstat (limited to 'arch/x86/kernel/acpi')
| -rw-r--r-- | arch/x86/kernel/acpi/sleep.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/x86/kernel/acpi/sleep.c b/arch/x86/kernel/acpi/sleep.c index e1252074ea40..74a847835bab 100644 --- a/arch/x86/kernel/acpi/sleep.c +++ b/arch/x86/kernel/acpi/sleep.c @@ -13,6 +13,11 @@ #include <asm/segment.h> #include <asm/desc.h> +#ifdef CONFIG_X86_32 +#include <asm/pgtable.h> +#include <asm/pgtable_32.h> +#endif + #include "realmode/wakeup.h" #include "sleep.h" @@ -91,7 +96,7 @@ int acpi_save_state_mem(void) #ifndef CONFIG_64BIT header->pmode_entry = (u32)&wakeup_pmode_return; - header->pmode_cr3 = (u32)(swsusp_pg_dir - __PAGE_OFFSET); + header->pmode_cr3 = (u32)__pa(&initial_page_table); saved_magic = 0x12345678; #else /* CONFIG_64BIT */ header->trampoline_segment = setup_trampoline() >> 4; |
