git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
x86-32, mm: Add an initial page table for core bootstrapping
[pandora-kernel.git]
/
arch
/
x86
/
kernel
/
acpi
/
sleep.c
diff --git
a/arch/x86/kernel/acpi/sleep.c
b/arch/x86/kernel/acpi/sleep.c
index
33cec15
..
b35e1ab
100644
(file)
--- a/
arch/x86/kernel/acpi/sleep.c
+++ b/
arch/x86/kernel/acpi/sleep.c
@@
-12,6
+12,11
@@
#include <asm/segment.h>
#include <asm/desc.h>
#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"
#include "realmode/wakeup.h"
#include "sleep.h"
@@
-90,7
+95,7
@@
int acpi_save_state_mem(void)
#ifndef CONFIG_64BIT
header->pmode_entry = (u32)&wakeup_pmode_return;
#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;
saved_magic = 0x12345678;
#else /* CONFIG_64BIT */
header->trampoline_segment = setup_trampoline() >> 4;