diff options
Diffstat (limited to 'arch/x86/kernel/acpi/sleep.c')
-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 @@ | |||
13 | #include <asm/segment.h> | 13 | #include <asm/segment.h> |
14 | #include <asm/desc.h> | 14 | #include <asm/desc.h> |
15 | 15 | ||
16 | #ifdef CONFIG_X86_32 | ||
17 | #include <asm/pgtable.h> | ||
18 | #include <asm/pgtable_32.h> | ||
19 | #endif | ||
20 | |||
16 | #include "realmode/wakeup.h" | 21 | #include "realmode/wakeup.h" |
17 | #include "sleep.h" | 22 | #include "sleep.h" |
18 | 23 | ||
@@ -91,7 +96,7 @@ int acpi_save_state_mem(void) | |||
91 | 96 | ||
92 | #ifndef CONFIG_64BIT | 97 | #ifndef CONFIG_64BIT |
93 | header->pmode_entry = (u32)&wakeup_pmode_return; | 98 | header->pmode_entry = (u32)&wakeup_pmode_return; |
94 | header->pmode_cr3 = (u32)(swsusp_pg_dir - __PAGE_OFFSET); | 99 | header->pmode_cr3 = (u32)__pa(&initial_page_table); |
95 | saved_magic = 0x12345678; | 100 | saved_magic = 0x12345678; |
96 | #else /* CONFIG_64BIT */ | 101 | #else /* CONFIG_64BIT */ |
97 | header->trampoline_segment = setup_trampoline() >> 4; | 102 | header->trampoline_segment = setup_trampoline() >> 4; |