Revert "[PATCH] x86: __pa and __pa_symbol address space separation"

This was broken.  It adds complexity, for no good reason.  Rather than
separate __pa() and __pa_symbol(), we should deprecate __pa_symbol(),
and preferably __pa() too - and just use "virt_to_phys()" instead, which
is more readable and has nicer semantics.

However, right now, just undo the separation, and make __pa_symbol() be
the exact same as __pa().  That fixes the bugs this patch introduced,
and we can do the fairly obvious cleanups later.

Do the new __phys_addr() function (which is now the actual workhorse for
the unified __pa()/__pa_symbol()) as a real external function, that way
all the potential issues with compile/link-time optimizations of
constant symbol addresses go away, and we can also, if we choose to, add
more sanity-checking of the argument.

Cc: Eric W. Biederman <ebiederm@xmission.com>
Cc: Vivek Goyal <vgoyal@in.ibm.com>
Cc: Andi Kleen <ak@suse.de>
Cc: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 8 insertions, 8 deletions

diff --git a/arch/x86_64/kernel/machine_kexec.c b/arch/x86_64/kernel/machine_kexec.c
index a8bb33c1a8f2..c3a554703672 100644
--- a/arch/x86_64/kernel/machine_kexec.c
+++ b/arch/x86_64/kernel/machine_kexec.c
@@ -189,21 +189,21 @@ NORET_TYPE void machine_kexec(struct kimage *image)
         control_page = page_address(image->control_code_page) + PAGE_SIZE;
         memcpy(control_page, relocate_kernel, PAGE_SIZE);
 
-        page_list[PA_CONTROL_PAGE] = __pa(control_page);
+        page_list[PA_CONTROL_PAGE] = virt_to_phys(control_page);
         page_list[VA_CONTROL_PAGE] = (unsigned long)relocate_kernel;
-        page_list[PA_PGD] = __pa_symbol(&kexec_pgd);
+        page_list[PA_PGD] = virt_to_phys(&kexec_pgd);
         page_list[VA_PGD] = (unsigned long)kexec_pgd;
-        page_list[PA_PUD_0] = __pa_symbol(&kexec_pud0);
+        page_list[PA_PUD_0] = virt_to_phys(&kexec_pud0);
         page_list[VA_PUD_0] = (unsigned long)kexec_pud0;
-        page_list[PA_PMD_0] = __pa_symbol(&kexec_pmd0);
+        page_list[PA_PMD_0] = virt_to_phys(&kexec_pmd0);
         page_list[VA_PMD_0] = (unsigned long)kexec_pmd0;
-        page_list[PA_PTE_0] = __pa_symbol(&kexec_pte0);
+        page_list[PA_PTE_0] = virt_to_phys(&kexec_pte0);
         page_list[VA_PTE_0] = (unsigned long)kexec_pte0;
-        page_list[PA_PUD_1] = __pa_symbol(&kexec_pud1);
+        page_list[PA_PUD_1] = virt_to_phys(&kexec_pud1);
         page_list[VA_PUD_1] = (unsigned long)kexec_pud1;
-        page_list[PA_PMD_1] = __pa_symbol(&kexec_pmd1);
+        page_list[PA_PMD_1] = virt_to_phys(&kexec_pmd1);
         page_list[VA_PMD_1] = (unsigned long)kexec_pmd1;
-        page_list[PA_PTE_1] = __pa_symbol(&kexec_pte1);
+        page_list[PA_PTE_1] = virt_to_phys(&kexec_pte1);
         page_list[VA_PTE_1] = (unsigned long)kexec_pte1;
 
         page_list[PA_TABLE_PAGE] =