OSDN Git Service
(root)
/
android-x86
/
kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'v3.8-rc5' into x86/mm
[android-x86/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
d5e0d71
..
0532f5d
100644
(file)
--- 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;
#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
saved_magic = 0x12345678;
#else /* CONFIG_64BIT */
#ifdef CONFIG_SMP