Revert "[PATCH] x86: __pa and __pa_symbol address space separation"
commite3ebadd95cb621e2c7436f3d3646447ac9d5c16d
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Mon, 7 May 2007 15:44:24 +0000 (7 08:44 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Mon, 7 May 2007 15:44:24 +0000 (7 08:44 -0700)
tree510b41550cc3751cfb565e3e2ba195a68b784a03
parent15700770ef7c5d12e2f1659d2ddbeb3f658d9f37
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>
arch/i386/kernel/alternative.c
arch/i386/mm/init.c
arch/x86_64/kernel/machine_kexec.c
arch/x86_64/kernel/setup.c
arch/x86_64/kernel/smp.c
arch/x86_64/mm/init.c
arch/x86_64/mm/ioremap.c
arch/x86_64/mm/pageattr.c
include/asm-x86_64/page.h
include/asm-x86_64/pgtable.h