Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit afd51a0e authored by Alexander Duyck's avatar Alexander Duyck Committed by H. Peter Anvin
Browse files

x86/acpi: Use __pa_symbol instead of __pa on C visible symbols 



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: default avatar"Rafael J. Wysocki" <rjw@sisk.pl>
Signed-off-by: default avatarAlexander Duyck <alexander.h.duyck@intel.com>
Link: http://lkml.kernel.org/r/20121116215737.8521.51167.stgit@ahduyck-cp1.jf.intel.com


Signed-off-by: default avatarH. Peter Anvin <hpa@linux.intel.com>
parent 217f155e

arch/x86/kernel/acpi/sleep.c

+1 −1
Original line number Diff line number Diff line
@@ -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