x86/acpi: Use __pa_symbol instead of __pa on C visible symbols
authorAlexander Duyck <alexander.h.duyck@intel.com>
Fri, 16 Nov 2012 21:57:43 +0000 (13:57 -0800)
committerH. Peter Anvin <hpa@linux.intel.com>
Sat, 17 Nov 2012 00:42:10 +0000 (16:42 -0800)
This change just updates one spot where __pa was being used when __pa_symbol
should have been used.  By using __pa_symbol we are able to drop a few extra
lines of code as we don't have to test to see if the virtual pointer is a
part of the kernel text or just standard virtual memory.

Cc: Len Brown <len.brown@intel.com>
Cc: Pavel Machek <pavel@ucw.cz>
Acked-by: "Rafael J. Wysocki" <rjw@sisk.pl>
Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com>
Link: http://lkml.kernel.org/r/20121116215737.8521.51167.stgit@ahduyck-cp1.jf.intel.com
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
arch/x86/kernel/acpi/sleep.c

index 11676cf65aee5ee51b64c8fadda0261c1f38599f..f146a3c1081471d615aadf9b445ea2ea71d4e940 100644 (file)
@@ -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