From a57e6969266f04895ef2e0011e774eef0b4b508f Mon Sep 17 00:00:00 2001 From: Alexander Duyck Date: Fri, 16 Nov 2012 13:57:43 -0800 Subject: [PATCH] --- yaml --- r: 356159 b: refs/heads/master c: afd51a0e32cd79261f0e823400886ed322a355ac h: refs/heads/master i: 356157: 555eb6ce7c50d22855ce26be462f818444ad7ea6 356155: 38bc905400b4ba808297525ffe1f6eb3ae86a05c 356151: d9db4758e3fbec5cfbda7a60262f3416c70fbd18 356143: 5f77cf476a828f7326f87b93905e4347550c1e7f 356127: b965d79b9864f0409cb11a52a5c7dbacdab92e76 356095: e047899bc7cb5717f27d9d7172af692723a37da1 v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/acpi/sleep.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 71758de4246f..12f27b4ee77f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 217f155e9fc68bf2a6c58a7b47e0d1ce68d78818 +refs/heads/master: afd51a0e32cd79261f0e823400886ed322a355ac diff --git a/trunk/arch/x86/kernel/acpi/sleep.c b/trunk/arch/x86/kernel/acpi/sleep.c index 11676cf65aee..f146a3c10814 100644 --- a/trunk/arch/x86/kernel/acpi/sleep.c +++ b/trunk/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