diff options
| author | H. Peter Anvin <hpa@linux.intel.com> | 2013-02-01 11:25:06 +0100 |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2013-02-01 11:28:36 +0100 |
| commit | 68d00bbebb5a48b7a9056a8c03476a71ecbc30a6 (patch) | |
| tree | 95af63041b79c43be37d734da6073fc82070f769 /arch/x86/kernel/acpi | |
| parent | x86: Don't panic if can not alloc buffer for swiotlb (diff) | |
| parent | x86-32, mm: Remove reference to alloc_remap() (diff) | |
| download | linux-68d00bbebb5a48b7a9056a8c03476a71ecbc30a6.tar.xz linux-68d00bbebb5a48b7a9056a8c03476a71ecbc30a6.zip | |
Merge remote-tracking branch 'origin/x86/mm' into x86/mm2
Explicitly merging these two branches due to nontrivial conflicts and
to allow further work.
Resolved Conflicts:
arch/x86/kernel/head32.c
arch/x86/kernel/head64.c
arch/x86/mm/init_64.c
arch/x86/realmode/init.c
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'arch/x86/kernel/acpi')
| -rw-r--r-- | arch/x86/kernel/acpi/sleep.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/acpi/sleep.c b/arch/x86/kernel/acpi/sleep.c index d5e0d717005a..0532f5d6e4ef 100644 --- a/arch/x86/kernel/acpi/sleep.c +++ b/arch/x86/kernel/acpi/sleep.c @@ -69,7 +69,7 @@ int acpi_suspend_lowlevel(void) #ifndef CONFIG_64BIT header->pmode_entry = (u32)&wakeup_pmode_return; - header->pmode_cr3 = (u32)__pa(&initial_page_table); + header->pmode_cr3 = (u32)__pa_symbol(initial_page_table); saved_magic = 0x12345678; #else /* CONFIG_64BIT */ #ifdef CONFIG_SMP |